diff options
Diffstat (limited to 'ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models')
42 files changed, 2325 insertions, 2295 deletions
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellData.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellData.java index 046d64a..f6c7401 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellData.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellData.java @@ -24,39 +24,39 @@ import java.util.List; public class CellData { - private CellInfo Cell; - private List<NbrDump> neighbor; - - public CellData() { - super(); - } - - /** - * Constructor with all parameters - * - * @param cell Contains cell details. - * @param neighbor Contains list of neighbor details. - */ - public CellData(CellInfo cell, List<NbrDump> neighbor) { - super(); - Cell = cell; - this.neighbor = neighbor; - } - - public CellInfo getCell() { - return Cell; - } - - public void setCell(CellInfo cell) { - Cell = cell; - } - - public List<NbrDump> getNeighbor() { - return neighbor; - } - - public void setNeighbor(List<NbrDump> neighbor) { - this.neighbor = neighbor; - } + private CellInfo Cell; + private List<NbrDump> neighbor; + + public CellData() { + super(); + } + + /** + * Constructor with all parameters + * + * @param cell Contains cell details. + * @param neighbor Contains list of neighbor details. + */ + public CellData(CellInfo cell, List<NbrDump> neighbor) { + super(); + Cell = cell; + this.neighbor = neighbor; + } + + public CellInfo getCell() { + return Cell; + } + + public void setCell(CellInfo cell) { + Cell = cell; + } + + public List<NbrDump> getNeighbor() { + return neighbor; + } + + public void setNeighbor(List<NbrDump> neighbor) { + this.neighbor = neighbor; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellDetails.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellDetails.java index 1c393d4..c50a097 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellDetails.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellDetails.java @@ -29,224 +29,224 @@ import javax.persistence.Table; @Table(name = "CellDetails") public class CellDetails implements Comparable<CellDetails> { - private String networkId; - private String nodeId; - private long physicalCellId; - private String nodeName; - private String nodeType; - private boolean pciCollisionDetected; - private boolean pciConfusionDetected; - private float gridX; - private float gridY; - private float screenX; - private float screenY; - private String latitude; - private String longitude; - private String serverId; - private int sectorNumber = 0; - private String color; - - /** - * Constructor with cell Id, pci and server Id for test cases. - * - * @param nodeId Node Id of Cell - * @param physicalCellId Pci value of the cell. - * @param serverId Server Id of the cell. - */ - public CellDetails(String nodeId, long physicalCellId, String serverId) { - super(); - this.nodeId = nodeId; - this.physicalCellId = physicalCellId; - this.serverId = serverId; - } - - /** - * A constructor for CellDetails( Database to store cell details). - * - * @param networkId network Id of the cell - * @param nodeId node Id of the cell - * @param physicalCellId PCI number of the cell - * @param nodeName node name - * @param nodeType node type based on the cluster - * @param pciCollisionDetected Checks if the cell has collision - * @param pciConfusionDetected Checks if the cell has confusion - * - * @param gridX -- - * @param gridY -- - * @param screenX x coordinate of the cell in the GUI - * @param screenY y coordinate of the cell in the GUI - * @param latitude latitude of the cell node - * @param longitude longitude of the cell node - * @param serverId server Id of the netconf server it belongs to - * @param sectorNumber sector number of the cell - * @param color color of the cell in the GUI - */ - public CellDetails(String networkId, String nodeId, long physicalCellId, String nodeName, String nodeType, - boolean pciCollisionDetected, boolean pciConfusionDetected, float gridX, float gridY, float screenX, - float screenY, String latitude, String longitude, String serverId, int sectorNumber, String color) { - super(); - this.networkId = networkId; - this.nodeId = nodeId; - this.physicalCellId = physicalCellId; - this.nodeName = nodeName; - this.nodeType = nodeType; - this.pciCollisionDetected = pciCollisionDetected; - this.pciConfusionDetected = pciConfusionDetected; - - this.gridX = gridX; - this.gridY = gridY; - this.screenX = screenX; - this.screenY = screenY; - this.latitude = latitude; - this.longitude = longitude; - this.serverId = serverId; - this.sectorNumber = sectorNumber; - this.color = color; - } - - public CellDetails() { - super(); - } - - public String getNetworkId() { - return networkId; - } - - public void setNetworkId(String networkId) { - this.networkId = networkId; - } - - @Id - @Column(name = "nodeId", unique = true, nullable = false, length = 50) - public String getNodeId() { - return nodeId; - } - - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } - - public long getPhysicalCellId() { - return physicalCellId; - } - - public void setPhysicalCellId(long physicalCellId) { - this.physicalCellId = physicalCellId; - } - - public String getNodeName() { - return nodeName; - } - - public void setNodeName(String nodeName) { - this.nodeName = nodeName; - } - - public String getNodeType() { - return nodeType; - } - - public void setNodeType(String nodeType) { - this.nodeType = nodeType; - } - - 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 float getGridX() { - return gridX; - } - - public void setGridX(float gridX) { - this.gridX = gridX; - } - - public float getGridY() { - return gridY; - } - - public void setGridY(float gridY) { - this.gridY = gridY; - } - - public float getScreenX() { - return screenX; - } - - public void setScreenX(float screenX) { - this.screenX = screenX; - } - - public float getScreenY() { - return screenY; - } - - public void setScreenY(float screenY) { - this.screenY = screenY; - } - - public String getServerId() { - return serverId; - } - - public void setServerId(String serverId) { - this.serverId = serverId; - } - - public int getSectorNumber() { - return sectorNumber; - } - - public void setSectorNumber(int sectorNumber) { - this.sectorNumber = sectorNumber; - } - - public String getColor() { - return color; - } - - public void setColor(String color) { - this.color = color; - } - - public String getLatitude() { - return latitude; - } - - public void setLatitude(String latitude) { - this.latitude = latitude; - } - - public String getLongitude() { - return longitude; - } - - public void setLongitude(String longitude) { - this.longitude = longitude; - } - - @Override - public String toString() { - return "Cell Details [networkId=" + networkId + ", nodeId=" + nodeId + ", physicalCellId=" + physicalCellId - + ", nodeName=" + nodeName + ", nodeType=" + nodeType + ", pciCollisionDetected=" + pciCollisionDetected - + ", pciConfusionDetected=" + pciConfusionDetected + "]"; - } - - @Override - public int compareTo(CellDetails cd) { - return this.getNodeId().compareTo(cd.getNodeId()); - } + private String networkId; + private String nodeId; + private long physicalCellId; + private String nodeName; + private String nodeType; + private boolean pciCollisionDetected; + private boolean pciConfusionDetected; + private float gridX; + private float gridY; + private float screenX; + private float screenY; + private String latitude; + private String longitude; + private String serverId; + private int sectorNumber = 0; + private String color; + + /** + * Constructor with cell Id, pci and server Id for test cases. + * + * @param nodeId Node Id of Cell + * @param physicalCellId Pci value of the cell. + * @param serverId Server Id of the cell. + */ + public CellDetails(String nodeId, long physicalCellId, String serverId) { + super(); + this.nodeId = nodeId; + this.physicalCellId = physicalCellId; + this.serverId = serverId; + } + + /** + * A constructor for CellDetails( Database to store cell details). + * + * @param networkId network Id of the cell + * @param nodeId node Id of the cell + * @param physicalCellId PCI number of the cell + * @param nodeName node name + * @param nodeType node type based on the cluster + * @param pciCollisionDetected Checks if the cell has collision + * @param pciConfusionDetected Checks if the cell has confusion + * + * @param gridX -- + * @param gridY -- + * @param screenX x coordinate of the cell in the GUI + * @param screenY y coordinate of the cell in the GUI + * @param latitude latitude of the cell node + * @param longitude longitude of the cell node + * @param serverId server Id of the netconf server it belongs to + * @param sectorNumber sector number of the cell + * @param color color of the cell in the GUI + */ + public CellDetails(String networkId, String nodeId, long physicalCellId, String nodeName, String nodeType, + boolean pciCollisionDetected, boolean pciConfusionDetected, float gridX, float gridY, float screenX, + float screenY, String latitude, String longitude, String serverId, int sectorNumber, String color) { + super(); + this.networkId = networkId; + this.nodeId = nodeId; + this.physicalCellId = physicalCellId; + this.nodeName = nodeName; + this.nodeType = nodeType; + this.pciCollisionDetected = pciCollisionDetected; + this.pciConfusionDetected = pciConfusionDetected; + + this.gridX = gridX; + this.gridY = gridY; + this.screenX = screenX; + this.screenY = screenY; + this.latitude = latitude; + this.longitude = longitude; + this.serverId = serverId; + this.sectorNumber = sectorNumber; + this.color = color; + } + + public CellDetails() { + super(); + } + + public String getNetworkId() { + return networkId; + } + + public void setNetworkId(String networkId) { + this.networkId = networkId; + } + + @Id + @Column(name = "nodeId", unique = true, nullable = false, length = 50) + public String getNodeId() { + return nodeId; + } + + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } + + public long getPhysicalCellId() { + return physicalCellId; + } + + public void setPhysicalCellId(long physicalCellId) { + this.physicalCellId = physicalCellId; + } + + public String getNodeName() { + return nodeName; + } + + public void setNodeName(String nodeName) { + this.nodeName = nodeName; + } + + public String getNodeType() { + return nodeType; + } + + public void setNodeType(String nodeType) { + this.nodeType = nodeType; + } + + 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 float getGridX() { + return gridX; + } + + public void setGridX(float gridX) { + this.gridX = gridX; + } + + public float getGridY() { + return gridY; + } + + public void setGridY(float gridY) { + this.gridY = gridY; + } + + public float getScreenX() { + return screenX; + } + + public void setScreenX(float screenX) { + this.screenX = screenX; + } + + public float getScreenY() { + return screenY; + } + + public void setScreenY(float screenY) { + this.screenY = screenY; + } + + public String getServerId() { + return serverId; + } + + public void setServerId(String serverId) { + this.serverId = serverId; + } + + public int getSectorNumber() { + return sectorNumber; + } + + public void setSectorNumber(int sectorNumber) { + this.sectorNumber = sectorNumber; + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + @Override + public String toString() { + return "Cell Details [networkId=" + networkId + ", nodeId=" + nodeId + ", physicalCellId=" + physicalCellId + + ", nodeName=" + nodeName + ", nodeType=" + nodeType + ", pciCollisionDetected=" + pciCollisionDetected + + ", pciConfusionDetected=" + pciConfusionDetected + "]"; + } + + @Override + public int compareTo(CellDetails cd) { + return this.getNodeId().compareTo(cd.getNodeId()); + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellInfo.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellInfo.java index 9a1b8da..4a18987 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellInfo.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellInfo.java @@ -22,95 +22,95 @@ package org.onap.ransim.rest.api.models; public class CellInfo { - private String networkId; - private String nodeId; - private long physicalCellId; - private String pnfName; - private int sectorNumber; - private String latitude; - private String longitude; - - /** - * A constructor for CellInfo. - * - * @param networkId network Id of the cell - * @param nodeId node Id of the cell - * @param physicalCellId PCI number of the cell - * @param pnfName netconf server id - * @param sectorNumber sector number for the cell - * @param latitude latitude of the node - * @param longitude longitude of the node - */ - public CellInfo(String networkId, String nodeId, long physicalCellId, String pnfName, int sectorNumber, - String latitude, String longitude) { - super(); - this.networkId = networkId; - this.nodeId = nodeId; - this.physicalCellId = physicalCellId; - this.pnfName = pnfName; - this.sectorNumber = sectorNumber; - this.latitude = latitude; - this.longitude = longitude; - } - - public CellInfo() { - - } - - public String getNetworkId() { - return networkId; - } - - public void setNetworkId(String networkId) { - this.networkId = networkId; - } - - public String getNodeId() { - return nodeId; - } - - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } - - public long getPhysicalCellId() { - return physicalCellId; - } - - public void setPhysicalCellId(long physicalCellId) { - this.physicalCellId = physicalCellId; - } - - public String getPnfName() { - return pnfName; - } - - public void setPnfName(String pnfName) { - this.pnfName = pnfName; - } - - public int getSectorNumber() { - return sectorNumber; - } - - public void setSectorNumber(int sectorNumber) { - this.sectorNumber = sectorNumber; - } - - public String getLatitude() { - return latitude; - } - - public void setLatitude(String latitude) { - this.latitude = latitude; - } - - public String getLongitude() { - return longitude; - } - - public void setLongitude(String longitude) { - this.longitude = longitude; - } + private String networkId; + private String nodeId; + private long physicalCellId; + private String pnfName; + private int sectorNumber; + private String latitude; + private String longitude; + + /** + * A constructor for CellInfo. + * + * @param networkId network Id of the cell + * @param nodeId node Id of the cell + * @param physicalCellId PCI number of the cell + * @param pnfName netconf server id + * @param sectorNumber sector number for the cell + * @param latitude latitude of the node + * @param longitude longitude of the node + */ + public CellInfo(String networkId, String nodeId, long physicalCellId, String pnfName, int sectorNumber, + String latitude, String longitude) { + super(); + this.networkId = networkId; + this.nodeId = nodeId; + this.physicalCellId = physicalCellId; + this.pnfName = pnfName; + this.sectorNumber = sectorNumber; + this.latitude = latitude; + this.longitude = longitude; + } + + public CellInfo() { + + } + + public String getNetworkId() { + return networkId; + } + + public void setNetworkId(String networkId) { + this.networkId = networkId; + } + + public String getNodeId() { + return nodeId; + } + + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } + + public long getPhysicalCellId() { + return physicalCellId; + } + + public void setPhysicalCellId(long physicalCellId) { + this.physicalCellId = physicalCellId; + } + + public String getPnfName() { + return pnfName; + } + + public void setPnfName(String pnfName) { + this.pnfName = pnfName; + } + + public int getSectorNumber() { + return sectorNumber; + } + + public void setSectorNumber(int sectorNumber) { + this.sectorNumber = sectorNumber; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellNeighbor.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellNeighbor.java index f0b9872..6c05f26 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellNeighbor.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CellNeighbor.java @@ -27,8 +27,8 @@ import java.util.Set; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Id; import javax.persistence.FetchType; +import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; @@ -39,48 +39,48 @@ import org.onap.ransim.rest.api.controller.RansimController; @Table(name = "CellNeighbor") public class CellNeighbor { - @Id - @Column(name = "nodeId", unique = true, nullable = false, length = 52) - private String nodeId; + @Id + @Column(name = "nodeId", unique = true, nullable = false, length = 52) + private String nodeId; - @OneToMany(targetEntity = NeighborDetails.class,fetch = FetchType.EAGER, cascade = CascadeType.ALL) - private Set<NeighborDetails> neighborList; + @OneToMany(targetEntity = NeighborDetails.class, fetch = FetchType.EAGER, cascade = CascadeType.ALL) + private Set<NeighborDetails> neighborList; - public CellNeighbor() { - super(); - } + public CellNeighbor() { + super(); + } - public CellNeighbor(String nodeId, Set<NeighborDetails> neighborList) { - super(); - this.nodeId = nodeId; - this.neighborList = neighborList; - } + public CellNeighbor(String nodeId, Set<NeighborDetails> neighborList) { + super(); + this.nodeId = nodeId; + this.neighborList = neighborList; + } - public String getNodeId() { - return nodeId; - } + public String getNodeId() { + return nodeId; + } - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } - public Set<NeighborDetails> getNeighborList() { - return neighborList; - } + public Set<NeighborDetails> getNeighborList() { + return neighborList; + } - public void setNeighborList(Set<NeighborDetails> neighborList) { - this.neighborList = neighborList; - } + public void setNeighborList(Set<NeighborDetails> neighborList) { + this.neighborList = neighborList; + } - static Logger log = Logger.getLogger(RansimController.class.getName()); + static Logger log = Logger.getLogger(RansimController.class.getName()); - public void display() { + public void display() { - List<NeighborDetails> iterator = new ArrayList<>(neighborList); - for (int ii = 0; ii < iterator.size(); ii++) { - log.info("neighbors NeighborList: " + iterator.get(ii).getNeigbor().getSourceCellNodeId() + " " - + iterator.get(ii).getNeigbor().getNeighborCell() + " " + iterator.get(ii).isBlacklisted()); - } + List<NeighborDetails> iterator = new ArrayList<>(neighborList); + for (int ii = 0; ii < iterator.size(); ii++) { + log.info("neighbors NeighborList: " + iterator.get(ii).getNeigbor().getSourceCellNodeId() + " " + + iterator.get(ii).getNeigbor().getNeighborCell() + " " + iterator.get(ii).isBlacklisted()); + } - } + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/ConfigData.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/ConfigData.java index 9af5537..afa454b 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/ConfigData.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/ConfigData.java @@ -22,22 +22,21 @@ package org.onap.ransim.rest.api.models; public class ConfigData { - private int maxNumberOfConns; + private int maxNumberOfConns; - public ConfigData() { - } + public ConfigData() { + } - public ConfigData(int maxNumberOfConns) { - super(); - this.maxNumberOfConns = maxNumberOfConns; - } + public ConfigData(int maxNumberOfConns) { + super(); + this.maxNumberOfConns = maxNumberOfConns; + } - public int getMaxNumberOfConns() { - return maxNumberOfConns; - } + public int getMaxNumberOfConns() { + return maxNumberOfConns; + } - public void setMaxNumberOfConns(int maxNumberOfConns) { - this.maxNumberOfConns = maxNumberOfConns; - } + public void setMaxNumberOfConns(int maxNumberOfConns) { + this.maxNumberOfConns = maxNumberOfConns; + } } - diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CreateACellReq.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CreateACellReq.java index 618facf..b216e5e 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CreateACellReq.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/CreateACellReq.java @@ -24,54 +24,54 @@ import java.io.Serializable; public class CreateACellReq implements Serializable { - private long physicalCellId; + private long physicalCellId; - private int gridX; - private int gridY; + private int gridX; + private int gridY; - private static final long serialVersionUID = 3736300675426332512L; + private static final long serialVersionUID = 3736300675426332512L; - public CreateACellReq() { - // Default constructor for CreateACellReq - } + public CreateACellReq() { + // Default constructor for CreateACellReq + } - /** - * A constructor for CreateACellReq. - * - * @param physicalCellId PCI number of the new cell - * @param gridX x coordinate value for the cell - * @param gridY y coordinate value for the cell - */ - public CreateACellReq(long physicalCellId, int gridX, int gridY) { - super(); + /** + * A constructor for CreateACellReq. + * + * @param physicalCellId PCI number of the new cell + * @param gridX x coordinate value for the cell + * @param gridY y coordinate value for the cell + */ + public CreateACellReq(long physicalCellId, int gridX, int gridY) { + super(); - this.physicalCellId = physicalCellId; + this.physicalCellId = physicalCellId; - this.gridX = gridX; - this.gridY = gridY; - } + this.gridX = gridX; + this.gridY = gridY; + } - public long getPhysicalCellId() { - return physicalCellId; - } + public long getPhysicalCellId() { + return physicalCellId; + } - public void setPhysicalCellId(long physicalCellId) { - this.physicalCellId = physicalCellId; - } + public void setPhysicalCellId(long physicalCellId) { + this.physicalCellId = physicalCellId; + } - public int getGridX() { - return gridX; - } + public int getGridX() { + return gridX; + } - public void setGridX(int gridX) { - this.gridX = gridX; - } + public void setGridX(int gridX) { + this.gridX = gridX; + } - public int getGridY() { - return gridY; - } + public int getGridY() { + return gridY; + } - public void setGridY(int gridY) { - this.gridY = gridY; - } + public void setGridY(int gridY) { + this.gridY = gridY; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/DeleteACellReq.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/DeleteACellReq.java index a6a7baf..7329a31 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/DeleteACellReq.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/DeleteACellReq.java @@ -22,28 +22,28 @@ package org.onap.ransim.rest.api.models; public class DeleteACellReq { - private String nodeId; + private String nodeId; - /** - * A constructor for DeleteACellReq. - * - * @param nodeId node Id of the cell to be deleted - */ - public DeleteACellReq(String nodeId) { - super(); - this.nodeId = nodeId; - } + /** + * A constructor for DeleteACellReq. + * + * @param nodeId node Id of the cell to be deleted + */ + public DeleteACellReq(String nodeId) { + super(); + this.nodeId = nodeId; + } - public DeleteACellReq() { + public DeleteACellReq() { - } + } - public String getNodeId() { - return nodeId; - } + public String getNodeId() { + return nodeId; + } - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } } 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 6b00369..2b7dd39 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 @@ -22,50 +22,50 @@ package org.onap.ransim.rest.api.models; public class FmAlarmInfo { - private String problem; - private String collisionCount; - private String confusionCount; + private String problem; + private String collisionCount; + private String confusionCount; - public FmAlarmInfo() { - super(); - } + public FmAlarmInfo() { + super(); + } - /** - * Constructor with all fields. - * - * @param problem Collision or Confusion - * @param collisionCount No of cells that causes collision. - * @param confusionCount No od cells that causes confusion. - */ - public FmAlarmInfo(String problem, String collisionCount, String confusionCount) { - super(); - this.problem = problem; - this.collisionCount = collisionCount; - this.confusionCount = confusionCount; - } + /** + * Constructor with all fields. + * + * @param problem Collision or Confusion + * @param collisionCount No of cells that causes collision. + * @param confusionCount No od cells that causes confusion. + */ + public FmAlarmInfo(String problem, String collisionCount, String confusionCount) { + super(); + this.problem = problem; + this.collisionCount = collisionCount; + this.confusionCount = confusionCount; + } - public String getProblem() { - return problem; - } + public String getProblem() { + return problem; + } - public void setProblem(String problem) { - this.problem = problem; - } + public void setProblem(String problem) { + this.problem = problem; + } - public String getCollisionCount() { - return collisionCount; - } + public String getCollisionCount() { + return collisionCount; + } - public void setCollisionCount(String collisionCount) { - this.collisionCount = collisionCount; - } + public void setCollisionCount(String collisionCount) { + this.collisionCount = collisionCount; + } - public String getConfusionCount() { - return confusionCount; - } + public String getConfusionCount() { + return confusionCount; + } - public void setConfusionCount(String confusionCount) { - this.confusionCount = confusionCount; - } + public void setConfusionCount(String confusionCount) { + this.confusionCount = confusionCount; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GNBCUCPFunction.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GNBCUCPFunction.java index 6efb34c..71f8b07 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GNBCUCPFunction.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GNBCUCPFunction.java @@ -35,79 +35,79 @@ import javax.persistence.Table; @Entity @Table(name = "GNBCUCPFUNCTION") public class GNBCUCPFunction implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Column(name = "GNBCUNAME") - private String gNBCUName; - @Column(name = "GNBID") - private Integer gNBId; - @Column(name = "GNBIDLENGTH") - private Integer gNBIdLength; - @Column(name = "PLMNID") - private String pLMNId; - @Column(name = "NFTYPE") - private String nFType; - @Column(name = "CELLCULIST") - @OneToMany(mappedBy = "gNBCUCPFunction", cascade = CascadeType.ALL) - private List<NRCellCU> cellCUList; - @ManyToOne // (cascade=CascadeType.ALL) - @JoinColumn(name = "nearrtricid") - private NearRTRIC nearRTRIC; - - public String getgNBCUName() { - return gNBCUName; - } - - public void setgNBCUName(String gNBCUName) { - this.gNBCUName = gNBCUName; - } - - public Integer getgNBId() { - return gNBId; - } - - public void setgNBId(Integer gNBId) { - this.gNBId = gNBId; - } - - public Integer getgNBIdLength() { - return gNBIdLength; - } - - public void setgNBIdLength(Integer gNBIdLength) { - this.gNBIdLength = gNBIdLength; - } - - public String getpLMNId() { - return pLMNId; - } - - public void setpLMNId(String pLMNId) { - this.pLMNId = pLMNId; - } - - public List<NRCellCU> getCellCUList() { - return cellCUList; - } - - public void setCellCUList(List<NRCellCU> cellCUList) { - this.cellCUList = cellCUList; - } - - public NearRTRIC getNearRTRIC() { - return nearRTRIC; - } - - public void setNearRTRIC(NearRTRIC nearRTRIC) { - this.nearRTRIC = nearRTRIC; - } - - public String getnFType() { - return nFType; - } - - public void setnFType(String nFType) { - this.nFType = nFType; - } + private static final long serialVersionUID = 1L; + @Id + @Column(name = "GNBCUNAME") + private String gNBCUName; + @Column(name = "GNBID") + private Integer gNBId; + @Column(name = "GNBIDLENGTH") + private Integer gNBIdLength; + @Column(name = "PLMNID") + private String pLMNId; + @Column(name = "NFTYPE") + private String nFType; + @Column(name = "CELLCULIST") + @OneToMany(mappedBy = "gNBCUCPFunction", cascade = CascadeType.ALL) + private List<NRCellCU> cellCUList; + @ManyToOne // (cascade=CascadeType.ALL) + @JoinColumn(name = "nearrtricid") + private NearRTRIC nearRTRIC; + + public String getgNBCUName() { + return gNBCUName; + } + + public void setgNBCUName(String gNBCUName) { + this.gNBCUName = gNBCUName; + } + + public Integer getgNBId() { + return gNBId; + } + + public void setgNBId(Integer gNBId) { + this.gNBId = gNBId; + } + + public Integer getgNBIdLength() { + return gNBIdLength; + } + + public void setgNBIdLength(Integer gNBIdLength) { + this.gNBIdLength = gNBIdLength; + } + + public String getpLMNId() { + return pLMNId; + } + + public void setpLMNId(String pLMNId) { + this.pLMNId = pLMNId; + } + + public List<NRCellCU> getCellCUList() { + return cellCUList; + } + + public void setCellCUList(List<NRCellCU> cellCUList) { + this.cellCUList = cellCUList; + } + + public NearRTRIC getNearRTRIC() { + return nearRTRIC; + } + + public void setNearRTRIC(NearRTRIC nearRTRIC) { + this.nearRTRIC = nearRTRIC; + } + + public String getnFType() { + return nFType; + } + + public void setnFType(String nFType) { + this.nFType = nFType; + } } 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 5a3af3e..790a638 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 @@ -37,79 +37,78 @@ import javax.persistence.Table; @Entity @Table(name = "GNBCUUPFUNCTION") public class GNBCUUPFunction implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Column(name = "GNBCUUPID") - private Integer gNBCUUPId; - @Column(name = "GNBID") - private Integer gNBId; - @Column(name = "GNBIDLENGTH") - private Integer gNBIdLength; - // @Column(name="PLMNINFOLIST") - // @OneToMany(mappedBy = "gNBCUUPFunction", - // cascade={CascadeType.PERSIST,CascadeType.REMOVE}) - @ElementCollection(fetch = FetchType.EAGER) - @CollectionTable(name = "PLMNINFO", joinColumns = @JoinColumn(name = "gnbcuupid")) - private List<PLMNInfo> pLMNInfoList; - @Column(name = "RESOURCETYPE") - private String resourceType; - @ManyToOne(cascade = CascadeType.ALL) - @JoinColumn(name = "nearrtricid") - private NearRTRIC nearRTRIC; - - public Integer getgNBCUUPId() { - return gNBCUUPId; - } - - public void setgNBCUUPId(Integer gNBCUUPId) { - this.gNBCUUPId = gNBCUUPId; - } - - public Integer getgNBId() { - return gNBId; - } - - public void setgNBId(Integer gNBId) { - this.gNBId = gNBId; - } - - public Integer getgNBIdLength() { - return gNBIdLength; - } - - public void setgNBIdLength(Integer gNBIdLength) { - this.gNBIdLength = gNBIdLength; - } - - public List<PLMNInfo> getpLMNInfoList() { - return pLMNInfoList; - } - - public void setpLMNInfoList(List<PLMNInfo> pLMNInfoList) { - this.pLMNInfoList = pLMNInfoList; - } - - public NearRTRIC getNearRTRIC() { - return nearRTRIC; - } - - public void setNearRTRIC(NearRTRIC nearRTRIC) { - this.nearRTRIC = nearRTRIC; - } - - public String getResourceType() { - return resourceType; - } - - public void setResourceType(String resourceType) { - this.resourceType = resourceType; - } - - @Override - public String toString() { - return "GNBCUUPFunction [gNBCUUPId=" + gNBCUUPId + ", gNBId=" + gNBId + ", gNBIdLength=" + gNBIdLength - + ", pLMNInfoList=" + pLMNInfoList + ", resourceType=" + resourceType + ", nearRTRIC=" + nearRTRIC - + "]"; - } + private static final long serialVersionUID = 1L; + @Id + @Column(name = "GNBCUUPID") + private Integer gNBCUUPId; + @Column(name = "GNBID") + private Integer gNBId; + @Column(name = "GNBIDLENGTH") + private Integer gNBIdLength; + // @Column(name="PLMNINFOLIST") + // @OneToMany(mappedBy = "gNBCUUPFunction", + // cascade={CascadeType.PERSIST,CascadeType.REMOVE}) + @ElementCollection(fetch = FetchType.EAGER) + @CollectionTable(name = "PLMNINFO", joinColumns = @JoinColumn(name = "gnbcuupid")) + private List<PLMNInfo> pLMNInfoList; + @Column(name = "RESOURCETYPE") + private String resourceType; + @ManyToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "nearrtricid") + private NearRTRIC nearRTRIC; + + public Integer getgNBCUUPId() { + return gNBCUUPId; + } + + public void setgNBCUUPId(Integer gNBCUUPId) { + this.gNBCUUPId = gNBCUUPId; + } + + public Integer getgNBId() { + return gNBId; + } + + public void setgNBId(Integer gNBId) { + this.gNBId = gNBId; + } + + public Integer getgNBIdLength() { + return gNBIdLength; + } + + public void setgNBIdLength(Integer gNBIdLength) { + this.gNBIdLength = gNBIdLength; + } + + public List<PLMNInfo> getpLMNInfoList() { + return pLMNInfoList; + } + + public void setpLMNInfoList(List<PLMNInfo> pLMNInfoList) { + this.pLMNInfoList = pLMNInfoList; + } + + public NearRTRIC getNearRTRIC() { + return nearRTRIC; + } + + public void setNearRTRIC(NearRTRIC nearRTRIC) { + this.nearRTRIC = nearRTRIC; + } + + public String getResourceType() { + return resourceType; + } + + public void setResourceType(String resourceType) { + this.resourceType = resourceType; + } + + @Override + public String toString() { + return "GNBCUUPFunction [gNBCUUPId=" + gNBCUUPId + ", gNBId=" + gNBId + ", gNBIdLength=" + gNBIdLength + + ", pLMNInfoList=" + pLMNInfoList + ", resourceType=" + resourceType + ", nearRTRIC=" + nearRTRIC + + "]"; + } } - diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GNBDUFunction.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GNBDUFunction.java index 2df9786..618d61b 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GNBDUFunction.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GNBDUFunction.java @@ -22,6 +22,7 @@ package org.onap.ransim.rest.api.models; import java.io.Serializable; import java.util.List; + import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; @@ -34,89 +35,89 @@ import javax.persistence.Table; @Entity @Table(name = "GNBDUFUNCTION") public class GNBDUFunction implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Column(name = "GNBDUID") - private Integer gNBDUId; - @Column(name = "GNBID") - private Integer gNBId; - @Column(name = "GNBIDLENGTH") - private Integer gNBIdLength; - @Column(name = "GNBDUNAME") - private String gNBDUName; - @Column(name = "PLMNID") - private String pLMNId; - @Column(name = "NFTYPE") - private String nFType; - @Column(name = "CELLDULIST") - @OneToMany(mappedBy = "gNBDUFunction", cascade = CascadeType.ALL) - private List<NRCellDU> cellDUList; - @ManyToOne - @JoinColumn(name = "nearrtricid") - private NearRTRIC nearRTRIC; - - public Integer getgNBDUId() { - return gNBDUId; - } - - public void setgNBDUId(Integer gNBDUId) { - this.gNBDUId = gNBDUId; - } - - public Integer getgNBId() { - return gNBId; - } - - public void setgNBId(Integer gNBId) { - this.gNBId = gNBId; - } - - public Integer getgNBIdLength() { - return gNBIdLength; - } - - public void setgNBIdLength(Integer gNBIdLength) { - this.gNBIdLength = gNBIdLength; - } - - public String getgNBDUName() { - return gNBDUName; - } - - public void setgNBDUName(String gNBDUName) { - this.gNBDUName = gNBDUName; - } - - public String getpLMNId() { - return pLMNId; - } - - public void setpLMNId(String pLMNId) { - this.pLMNId = pLMNId; - } - - public List<NRCellDU> getCellDUList() { - return cellDUList; - } - - public void setCellDUList(List<NRCellDU> cellDUList) { - this.cellDUList = cellDUList; - } - - public NearRTRIC getNearRTRIC() { - return nearRTRIC; - } - - public void setNearRTRIC(NearRTRIC nearRTRIC) { - this.nearRTRIC = nearRTRIC; - } - - public String getnFType() { - return nFType; - } - - public void setnFType(String nFType) { - this.nFType = nFType; - } + private static final long serialVersionUID = 1L; + @Id + @Column(name = "GNBDUID") + private Integer gNBDUId; + @Column(name = "GNBID") + private Integer gNBId; + @Column(name = "GNBIDLENGTH") + private Integer gNBIdLength; + @Column(name = "GNBDUNAME") + private String gNBDUName; + @Column(name = "PLMNID") + private String pLMNId; + @Column(name = "NFTYPE") + private String nFType; + @Column(name = "CELLDULIST") + @OneToMany(mappedBy = "gNBDUFunction", cascade = CascadeType.ALL) + private List<NRCellDU> cellDUList; + @ManyToOne + @JoinColumn(name = "nearrtricid") + private NearRTRIC nearRTRIC; + + public Integer getgNBDUId() { + return gNBDUId; + } + + public void setgNBDUId(Integer gNBDUId) { + this.gNBDUId = gNBDUId; + } + + public Integer getgNBId() { + return gNBId; + } + + public void setgNBId(Integer gNBId) { + this.gNBId = gNBId; + } + + public Integer getgNBIdLength() { + return gNBIdLength; + } + + public void setgNBIdLength(Integer gNBIdLength) { + this.gNBIdLength = gNBIdLength; + } + + public String getgNBDUName() { + return gNBDUName; + } + + public void setgNBDUName(String gNBDUName) { + this.gNBDUName = gNBDUName; + } + + public String getpLMNId() { + return pLMNId; + } + + public void setpLMNId(String pLMNId) { + this.pLMNId = pLMNId; + } + + public List<NRCellDU> getCellDUList() { + return cellDUList; + } + + public void setCellDUList(List<NRCellDU> cellDUList) { + this.cellDUList = cellDUList; + } + + public NearRTRIC getNearRTRIC() { + return nearRTRIC; + } + + public void setNearRTRIC(NearRTRIC nearRTRIC) { + this.nearRTRIC = nearRTRIC; + } + + public String getnFType() { + return nFType; + } + + public void setnFType(String nFType) { + this.nFType = nFType; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetACellDetailReq.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetACellDetailReq.java index 8d49d1a..887d3bf 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetACellDetailReq.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetACellDetailReq.java @@ -22,28 +22,28 @@ package org.onap.ransim.rest.api.models; public class GetACellDetailReq { - private String nodeId; + private String nodeId; - /** - * A constructor for GetACellDetailReq. - * - * @param nodeId node id of the cell - */ - public GetACellDetailReq(String nodeId) { - super(); - this.nodeId = nodeId; - } + /** + * A constructor for GetACellDetailReq. + * + * @param nodeId node id of the cell + */ + public GetACellDetailReq(String nodeId) { + super(); + this.nodeId = nodeId; + } - public GetACellDetailReq() { + public GetACellDetailReq() { - } + } - public String getNodeId() { - return nodeId; - } + public String getNodeId() { + return nodeId; + } - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetNeighborList.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetNeighborList.java index 320db9d..11e8019 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetNeighborList.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetNeighborList.java @@ -17,56 +17,57 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.ransim.rest.api.models; import java.util.List; public class GetNeighborList { - private String nodeId; - private List<CellDetails> cellsWithNoHo; - private List<CellDetails> cellsWithHo; + private String nodeId; + private List<CellDetails> cellsWithNoHo; + private List<CellDetails> cellsWithHo; - public GetNeighborList() { - super(); - } + public GetNeighborList() { + super(); + } - /** - * Constructor with all fields. - * - * @param nodeId Node Id of cell - * @param cellsWithNoHO List of neighbors with unsuccessful handover. - * @param cellsWithHO List of neighbors with successful handover. - */ - public GetNeighborList(String nodeId, List<CellDetails> cellsWithNoHo, List<CellDetails> cellsWithHo) { - super(); - this.nodeId = nodeId; - this.cellsWithNoHo = cellsWithNoHo; - this.cellsWithHo = cellsWithHo; - } + /** + * Constructor with all fields. + * + * @param nodeId Node Id of cell + * @param cellsWithNoHO List of neighbors with unsuccessful handover. + * @param cellsWithHO List of neighbors with successful handover. + */ + public GetNeighborList(String nodeId, List<CellDetails> cellsWithNoHo, List<CellDetails> cellsWithHo) { + super(); + this.nodeId = nodeId; + this.cellsWithNoHo = cellsWithNoHo; + this.cellsWithHo = cellsWithHo; + } - public String getNodeId() { - return nodeId; - } + public String getNodeId() { + return nodeId; + } - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } - public List<CellDetails> getCellsWithNoHo() { - return cellsWithNoHo; - } + public List<CellDetails> getCellsWithNoHo() { + return cellsWithNoHo; + } - public void setCellsWithNoHo(List<CellDetails> cellsWithNoHo) { - this.cellsWithNoHo = cellsWithNoHo; - } + public void setCellsWithNoHo(List<CellDetails> cellsWithNoHo) { + this.cellsWithNoHo = cellsWithNoHo; + } - public List<CellDetails> getCellsWithHo() { - return cellsWithHo; - } + public List<CellDetails> getCellsWithHo() { + return cellsWithHo; + } - public void setCellsWithHo(List<CellDetails> cellsWithHo) { - this.cellsWithHo = cellsWithHo; - } + public void setCellsWithHo(List<CellDetails> cellsWithHo) { + this.cellsWithHo = cellsWithHo; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetNeighborListReq.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetNeighborListReq.java index 3ec491c..b779112 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetNeighborListReq.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetNeighborListReq.java @@ -22,28 +22,28 @@ package org.onap.ransim.rest.api.models; public class GetNeighborListReq { - private String nodeId; + private String nodeId; - public GetNeighborListReq() { + public GetNeighborListReq() { - } + } - /** - * A constructor for GetNeighborListReq. - * - * @param nodeId node Id of the cell who's neighbor list is required - */ - public GetNeighborListReq(String nodeId) { - super(); - this.nodeId = nodeId; - } + /** + * A constructor for GetNeighborListReq. + * + * @param nodeId node Id of the cell who's neighbor list is required + */ + public GetNeighborListReq(String nodeId) { + super(); + this.nodeId = nodeId; + } - public String getNodeId() { - return nodeId; - } + public String getNodeId() { + return nodeId; + } - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetNetconfServerDetailsReq.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetNetconfServerDetailsReq.java index 5349190..da0e410 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetNetconfServerDetailsReq.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetNetconfServerDetailsReq.java @@ -22,29 +22,29 @@ package org.onap.ransim.rest.api.models; public class GetNetconfServerDetailsReq { - private String serverId; - - /** - * A constructor for GetNetconfServerDetailsReq. - * - * @param serverId server Id of the netconf server - */ - public GetNetconfServerDetailsReq(String serverId) { - super(); - this.serverId = serverId; - } - - public GetNetconfServerDetailsReq() { - - // TODO Auto-generated constructor stub - } - - public String getServerId() { - return serverId; - } - - public void setServerId(String serverId) { - this.serverId = serverId; - } + private String serverId; + + /** + * A constructor for GetNetconfServerDetailsReq. + * + * @param serverId server Id of the netconf server + */ + public GetNetconfServerDetailsReq(String serverId) { + super(); + this.serverId = serverId; + } + + public GetNetconfServerDetailsReq() { + + // TODO Auto-generated constructor stub + } + + public String getServerId() { + return serverId; + } + + public void setServerId(String serverId) { + this.serverId = serverId; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetPmDataReq.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetPmDataReq.java index 245dea3..ce1a715 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetPmDataReq.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetPmDataReq.java @@ -17,43 +17,44 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.ransim.rest.api.models; public class GetPmDataReq { - private String nodeIdBad; - private String nodeIdPoor; - - public GetPmDataReq() { - super(); - } - - /** - * Constructor with all fields. - * - * @param nodeIdBad Cells with bad PM value. - * @param nodeIdPoor Cells with poor PM value. - */ - public GetPmDataReq(String nodeIdBad, String nodeIdPoor) { - super(); - this.nodeIdBad = nodeIdBad; - this.nodeIdPoor = nodeIdPoor; - } - - public String getNodeIdBad() { - return nodeIdBad; - } - - public void setNodeIdBad(String nodeIdBad) { - this.nodeIdBad = nodeIdBad; - } - - public String getNodeIdPoor() { - return nodeIdPoor; - } - - public void setNodeIdPoor(String nodeIdPoor) { - this.nodeIdPoor = nodeIdPoor; - } + private String nodeIdBad; + private String nodeIdPoor; + + public GetPmDataReq() { + super(); + } + + /** + * Constructor with all fields. + * + * @param nodeIdBad Cells with bad PM value. + * @param nodeIdPoor Cells with poor PM value. + */ + public GetPmDataReq(String nodeIdBad, String nodeIdPoor) { + super(); + this.nodeIdBad = nodeIdBad; + this.nodeIdPoor = nodeIdPoor; + } + + public String getNodeIdBad() { + return nodeIdBad; + } + + public void setNodeIdBad(String nodeIdBad) { + this.nodeIdBad = nodeIdBad; + } + + public String getNodeIdPoor() { + return nodeIdPoor; + } + + public void setNodeIdPoor(String nodeIdPoor) { + this.nodeIdPoor = nodeIdPoor; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetTopology.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetTopology.java index 6b2cf32..f193d5a 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetTopology.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GetTopology.java @@ -21,72 +21,72 @@ package org.onap.ransim.rest.api.models; public class GetTopology { - private CellDetails currentCell; - private int gridX; - private int gridY; - private String nodeId; - private long physicalCellId; - - /** - * A constructor GetTopology. - * - * @param currentCell current cell details - * @param gridX x coordinate value for the cell - * @param gridY y coordinate value for the cell - * @param nodeId node id of the cell - * @param physicalCellId pci value for the cell - */ - public GetTopology(CellDetails currentCell, int gridX, int gridY, String nodeId, long physicalCellId) { - super(); - this.currentCell = currentCell; - this.gridX = gridX; - this.gridY = gridY; - this.nodeId = nodeId; - this.physicalCellId = physicalCellId; - } - - public GetTopology() { - - } - - public CellDetails getCurrentCell() { - return currentCell; - } - - public void setCurrentCell(CellDetails currentCell) { - this.currentCell = currentCell; - } - - public int getGridX() { - return gridX; - } - - public void setGridX(int gridX) { - this.gridX = gridX; - } - - public int getGridY() { - return gridY; - } - - public void setGridY(int gridY) { - this.gridY = gridY; - } - - public String getNodeId() { - return nodeId; - } - - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } - - public long getPhysicalCellId() { - return physicalCellId; - } - - public void setPhysicalCellId(long physicalCellId) { - this.physicalCellId = physicalCellId; - } + private CellDetails currentCell; + private int gridX; + private int gridY; + private String nodeId; + private long physicalCellId; + + /** + * A constructor GetTopology. + * + * @param currentCell current cell details + * @param gridX x coordinate value for the cell + * @param gridY y coordinate value for the cell + * @param nodeId node id of the cell + * @param physicalCellId pci value for the cell + */ + public GetTopology(CellDetails currentCell, int gridX, int gridY, String nodeId, long physicalCellId) { + super(); + this.currentCell = currentCell; + this.gridX = gridX; + this.gridY = gridY; + this.nodeId = nodeId; + this.physicalCellId = physicalCellId; + } + + public GetTopology() { + + } + + public CellDetails getCurrentCell() { + return currentCell; + } + + public void setCurrentCell(CellDetails currentCell) { + this.currentCell = currentCell; + } + + public int getGridX() { + return gridX; + } + + public void setGridX(int gridX) { + this.gridX = gridX; + } + + public int getGridY() { + return gridY; + } + + public void setGridY(int gridY) { + this.gridY = gridY; + } + + public String getNodeId() { + return nodeId; + } + + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } + + public long getPhysicalCellId() { + return physicalCellId; + } + + public void setPhysicalCellId(long physicalCellId) { + this.physicalCellId = physicalCellId; + } } 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 6d20fcf..ff715e3 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 @@ -22,52 +22,52 @@ package org.onap.ransim.rest.api.models; public class ModifyACellReq { - private String nodeId; - private Long newPhysicalCellId; - private String newNbrs; + private String nodeId; + private Long newPhysicalCellId; + private String newNbrs; - /** - * A constructor for ModifyACellReq. - * - * @param nodeId node Id of the cell which is to be modified - * @param newPhysicalCellId new PCI number for the cell - * @param newNbrs new neighbor list for the cell - */ - public ModifyACellReq(String nodeId, Long newPhysicalCellId, String newNbrs) { - super(); - this.nodeId = nodeId; - this.newPhysicalCellId = newPhysicalCellId; - this.newNbrs = newNbrs; + /** + * A constructor for ModifyACellReq. + * + * @param nodeId node Id of the cell which is to be modified + * @param newPhysicalCellId new PCI number for the cell + * @param newNbrs new neighbor list for the cell + */ + public ModifyACellReq(String nodeId, Long newPhysicalCellId, String newNbrs) { + super(); + this.nodeId = nodeId; + this.newPhysicalCellId = newPhysicalCellId; + this.newNbrs = newNbrs; - } + } - public ModifyACellReq() { + public ModifyACellReq() { - // Default constructor for ModifyCell - } + // Default constructor for ModifyCell + } - public String getNodeId() { - return nodeId; - } + public String getNodeId() { + return nodeId; + } - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } - public Long getNewPhysicalCellId() { - return newPhysicalCellId; - } + public Long getNewPhysicalCellId() { + return newPhysicalCellId; + } - public void setNewPhysicalCellId(Long newPhysicalCellId) { - this.newPhysicalCellId = newPhysicalCellId; - } + public void setNewPhysicalCellId(Long newPhysicalCellId) { + this.newPhysicalCellId = newPhysicalCellId; + } - public String getNewNbrs() { - return newNbrs; - } + public String getNewNbrs() { + return newNbrs; + } - public void setNewNbrs(String newNbrs) { - this.newNbrs = newNbrs; - } + public void setNewNbrs(String newNbrs) { + this.newNbrs = newNbrs; + } } 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 89ffdd7..2d49f63 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 @@ -22,6 +22,7 @@ package org.onap.ransim.rest.api.models; import java.io.Serializable; import java.util.List; + import javax.persistence.CascadeType; import javax.persistence.CollectionTable; import javax.persistence.Column; @@ -37,50 +38,49 @@ import javax.persistence.Table; @Entity @Table(name = "NRCELLCU") public class NRCellCU implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Column(name = "CELLLOCALID") - private Integer cellLocalId; - @Column(name = "RESOURCETYPE") - private String resourceType; - @ElementCollection(fetch = FetchType.EAGER) - @CollectionTable(name = "PLMNINFO", joinColumns = @JoinColumn(name = "nrcellcu_celllocalid")) - private List<PLMNInfo> pLMNInfoList; - @ManyToOne - @JoinColumn(name = "gnbcuname") - private GNBCUCPFunction gNBCUCPFunction; + private static final long serialVersionUID = 1L; + @Id + @Column(name = "CELLLOCALID") + private Integer cellLocalId; + @Column(name = "RESOURCETYPE") + private String resourceType; + @ElementCollection(fetch = FetchType.EAGER) + @CollectionTable(name = "PLMNINFO", joinColumns = @JoinColumn(name = "nrcellcu_celllocalid")) + private List<PLMNInfo> pLMNInfoList; + @ManyToOne + @JoinColumn(name = "gnbcuname") + private GNBCUCPFunction gNBCUCPFunction; - public Integer getCellLocalId() { - return cellLocalId; - } + public Integer getCellLocalId() { + return cellLocalId; + } - public void setCellLocalId(Integer cellLocalId) { - this.cellLocalId = cellLocalId; - } + public void setCellLocalId(Integer cellLocalId) { + this.cellLocalId = cellLocalId; + } - public List<PLMNInfo> getpLMNInfoList() { - return pLMNInfoList; - } + public List<PLMNInfo> getpLMNInfoList() { + return pLMNInfoList; + } - public void setpLMNInfoList(List<PLMNInfo> pLMNInfoList) { - this.pLMNInfoList = pLMNInfoList; - } + public void setpLMNInfoList(List<PLMNInfo> pLMNInfoList) { + this.pLMNInfoList = pLMNInfoList; + } - public GNBCUCPFunction getgNBCUCPFunction() { - return gNBCUCPFunction; - } + public GNBCUCPFunction getgNBCUCPFunction() { + return gNBCUCPFunction; + } - public void setgNBCUCPFunction(GNBCUCPFunction gNBCUCPFunction) { - this.gNBCUCPFunction = gNBCUCPFunction; - } + public void setgNBCUCPFunction(GNBCUCPFunction gNBCUCPFunction) { + this.gNBCUCPFunction = gNBCUCPFunction; + } - public String getResourceType() { - return resourceType; - } + public String getResourceType() { + return resourceType; + } - public void setResourceType(String resourceType) { - this.resourceType = resourceType; - } + public void setResourceType(String resourceType) { + this.resourceType = resourceType; + } } - diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NRCellDU.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NRCellDU.java index e93f5aa..4bd9f1c 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NRCellDU.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NRCellDU.java @@ -22,6 +22,7 @@ package org.onap.ransim.rest.api.models; import java.io.Serializable; import java.util.List; + import javax.persistence.CascadeType; import javax.persistence.CollectionTable; import javax.persistence.Column; @@ -35,91 +36,110 @@ import javax.persistence.OneToMany; import javax.persistence.Table; @Entity -@Table(name="NRCELLDU") -public class NRCellDU implements Serializable{ - private static final long serialVersionUID = 1L; - @Id - @Column(name="CELLLOCALID") - private Integer cellLocalId; - @Column(name="OPERATIONALSTATE") - private String operationalState; - @Column(name="ADMINISTRATIVESTATE") - private String administrativeState; - @Column(name="CELLSTATE") - private String cellState; - @ElementCollection(fetch = FetchType.EAGER) - @CollectionTable(name="PLMNINFO",joinColumns = @JoinColumn(name="nrcelldu_celllocalid")) - private List<PLMNInfo> pLMNInfoList; - @Column(name="NRPCI") - private Integer nRPCI; - @Column(name="nRTAC") - private Integer nRTAC; - @Column(name="RESOURCETYPE") - private String resourceType; - @ManyToOne - @JoinColumn(name = "gnbduid") - private GNBDUFunction gNBDUFunction; - @Column(name="prb") - private Integer prbs; - - public Integer getCellLocalId() { - return cellLocalId; - } - public void setCellLocalId(Integer cellLocalId) { - this.cellLocalId = cellLocalId; - } - public List<PLMNInfo> getpLMNInfoList() { - return pLMNInfoList; - } - public void setpLMNInfoList(List<PLMNInfo> pLMNInfoList) { - this.pLMNInfoList = pLMNInfoList; - } - public String getOperationalState() { - return operationalState; - } - public void setOperationalState(String operationalState) { - this.operationalState = operationalState; - } - public String getAdministrativeState() { - return administrativeState; - } - public void setAdministrativeState(String administrativeState) { - this.administrativeState = administrativeState; - } - public String getCellState() { - return cellState; - } - public void setCellState(String cellState) { - this.cellState = cellState; - } - public Integer getnRPCI() { - return nRPCI; - } - public void setnRPCI(Integer nRPCI) { - this.nRPCI = nRPCI; - } - public Integer getnRTAC() { - return nRTAC; - } - public void setnRTAC(Integer nRTAC) { - this.nRTAC = nRTAC; - } - public GNBDUFunction getgNBDUFunction() { - return gNBDUFunction; - } - public void setgNBDUFunction(GNBDUFunction gNBDUFunction) { - this.gNBDUFunction = gNBDUFunction; - } - public String getResourceType() { - return resourceType; - } - public void setResourceType(String resourceType) { - this.resourceType = resourceType; - } - public Integer getPrbs() { - return prbs; - } - public void setPrbs(Integer prbs) { - this.prbs = prbs; - } +@Table(name = "NRCELLDU") +public class NRCellDU implements Serializable { + private static final long serialVersionUID = 1L; + @Id + @Column(name = "CELLLOCALID") + private Integer cellLocalId; + @Column(name = "OPERATIONALSTATE") + private String operationalState; + @Column(name = "ADMINISTRATIVESTATE") + private String administrativeState; + @Column(name = "CELLSTATE") + private String cellState; + @ElementCollection(fetch = FetchType.EAGER) + @CollectionTable(name = "PLMNINFO", joinColumns = @JoinColumn(name = "nrcelldu_celllocalid")) + private List<PLMNInfo> pLMNInfoList; + @Column(name = "NRPCI") + private Integer nRPCI; + @Column(name = "nRTAC") + private Integer nRTAC; + @Column(name = "RESOURCETYPE") + private String resourceType; + @ManyToOne + @JoinColumn(name = "gnbduid") + private GNBDUFunction gNBDUFunction; + @Column(name = "prb") + private Integer prbs; + + public Integer getCellLocalId() { + return cellLocalId; + } + + public void setCellLocalId(Integer cellLocalId) { + this.cellLocalId = cellLocalId; + } + + public List<PLMNInfo> getpLMNInfoList() { + return pLMNInfoList; + } + + public void setpLMNInfoList(List<PLMNInfo> pLMNInfoList) { + this.pLMNInfoList = pLMNInfoList; + } + + public String getOperationalState() { + return operationalState; + } + + public void setOperationalState(String operationalState) { + this.operationalState = operationalState; + } + + public String getAdministrativeState() { + return administrativeState; + } + + public void setAdministrativeState(String administrativeState) { + this.administrativeState = administrativeState; + } + + public String getCellState() { + return cellState; + } + + public void setCellState(String cellState) { + this.cellState = cellState; + } + + public Integer getnRPCI() { + return nRPCI; + } + + public void setnRPCI(Integer nRPCI) { + this.nRPCI = nRPCI; + } + + public Integer getnRTAC() { + return nRTAC; + } + + public void setnRTAC(Integer nRTAC) { + this.nRTAC = nRTAC; + } + + public GNBDUFunction getgNBDUFunction() { + return gNBDUFunction; + } + + public void setgNBDUFunction(GNBDUFunction gNBDUFunction) { + this.gNBDUFunction = gNBDUFunction; + } + + public String getResourceType() { + return resourceType; + } + + public void setResourceType(String resourceType) { + this.resourceType = resourceType; + } + + public Integer getPrbs() { + return prbs; + } + + public void setPrbs(Integer prbs) { + this.prbs = prbs; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NSSAIConfig.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NSSAIConfig.java index e650ff1..db7c4e0 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NSSAIConfig.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NSSAIConfig.java @@ -21,53 +21,54 @@ package org.onap.ransim.rest.api.models; import java.io.Serializable; +import java.sql.Timestamp; + import javax.persistence.Column; import javax.persistence.Embeddable; import javax.persistence.Table; -import java.sql.Timestamp; @Table(name = "NSSAICONFIG") @Embeddable public class NSSAIConfig implements Serializable { - private static final long serialVersionUID = 1L; - @Column(name = "DLTHPTPERSLICE") - private Integer dLThptPerSlice; - @Column(name = "ULTHPTPERSLICE") - private Integer uLThptPerSlice; - @Column(name = "MAXNUMBEROFCONNS") - private Integer maxNumberOfConns; - @Column(name = "LASTUPDATEDTS") - private Timestamp lastUpdatedTS; + private static final long serialVersionUID = 1L; + @Column(name = "DLTHPTPERSLICE") + private Integer dLThptPerSlice; + @Column(name = "ULTHPTPERSLICE") + private Integer uLThptPerSlice; + @Column(name = "MAXNUMBEROFCONNS") + private Integer maxNumberOfConns; + @Column(name = "LASTUPDATEDTS") + private Timestamp lastUpdatedTS; - public Integer getdLThptPerSlice() { - return dLThptPerSlice; - } + public Integer getdLThptPerSlice() { + return dLThptPerSlice; + } - public void setdLThptPerSlice(Integer dLThptPerSlice) { - this.dLThptPerSlice = dLThptPerSlice; - } + public void setdLThptPerSlice(Integer dLThptPerSlice) { + this.dLThptPerSlice = dLThptPerSlice; + } - public Integer getuLThptPerSlice() { - return uLThptPerSlice; - } + public Integer getuLThptPerSlice() { + return uLThptPerSlice; + } - public void setuLThptPerSlice(Integer uLThptPerSlice) { - this.uLThptPerSlice = uLThptPerSlice; - } + public void setuLThptPerSlice(Integer uLThptPerSlice) { + this.uLThptPerSlice = uLThptPerSlice; + } - public Integer getMaxNumberOfConns() { - return maxNumberOfConns; - } + public Integer getMaxNumberOfConns() { + return maxNumberOfConns; + } - public void setMaxNumberOfConns(Integer maxNumberOfConns) { - this.maxNumberOfConns = maxNumberOfConns; - } + public void setMaxNumberOfConns(Integer maxNumberOfConns) { + this.maxNumberOfConns = maxNumberOfConns; + } - public Timestamp getLastUpdatedTS() { - return lastUpdatedTS; - } + public Timestamp getLastUpdatedTS() { + return lastUpdatedTS; + } - public void setLastUpdatedTS(Timestamp lastUpdatedTS) { - this.lastUpdatedTS = lastUpdatedTS; - } + public void setLastUpdatedTS(Timestamp lastUpdatedTS) { + this.lastUpdatedTS = lastUpdatedTS; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NbrDump.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NbrDump.java index 1033b3b..23fe8ef 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NbrDump.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NbrDump.java @@ -17,38 +17,39 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.ransim.rest.api.models; public class NbrDump { - private String nodeId; - private String blacklisted; + private String nodeId; + private String blacklisted; - public NbrDump() { - super(); - // TODO Auto-generated constructor stub - } + public NbrDump() { + super(); + // TODO Auto-generated constructor stub + } - public NbrDump(String nodeId, String blacklisted) { - super(); - this.nodeId = nodeId; - this.blacklisted = blacklisted; - } + public NbrDump(String nodeId, String blacklisted) { + super(); + this.nodeId = nodeId; + this.blacklisted = blacklisted; + } - public String getNodeId() { - return nodeId; - } + public String getNodeId() { + return nodeId; + } - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } - public String getBlacklisted() { - return blacklisted; - } + public String getBlacklisted() { + return blacklisted; + } - public void setBlacklisted(String blacklisted) { - this.blacklisted = blacklisted; - } + public void setBlacklisted(String blacklisted) { + this.blacklisted = blacklisted; + } } 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 c2fbd06..5a716e9 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 @@ -22,6 +22,7 @@ package org.onap.ransim.rest.api.models; import java.io.Serializable; import java.util.List; + import javax.persistence.CascadeType; import javax.persistence.CollectionTable; import javax.persistence.Column; @@ -35,100 +36,100 @@ import javax.persistence.Table; @Entity @Table(name = "NEARRTRIC") public class NearRTRIC implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Column(name = "NEARRTRICID") - private Integer nearRTRICId; - @Column(name = "GNBID") - private Integer gNBId; - @ElementCollection(targetClass = String.class) - @CollectionTable(name = "TRACKINGAREA", joinColumns = @JoinColumn(name = "nearrtricid")) - private List<String> trackingArea; - @Column(name = "RESOURCETYPE") - private String resourceType; - @OneToMany(mappedBy = "nearRTRIC", cascade = CascadeType.ALL) - private List<GNBCUCPFunction> gNBCUCPList; - @OneToMany(mappedBy = "nearRTRIC", cascade = CascadeType.ALL) - private List<GNBCUUPFunction> gNBCUUPList; - @OneToMany(mappedBy = "nearRTRIC", cascade = CascadeType.ALL) - private List<GNBDUFunction> gNBDUList; - @ElementCollection(targetClass = String.class) - @CollectionTable(name = "RANNFNSSI", joinColumns = @JoinColumn(name = "nearrtricid")) - private List<String> ranNFNSSIList; - @ElementCollection - @CollectionTable(name = "PLMNINFO", joinColumns = @JoinColumn(name = "nearrtricid")) - private List<PLMNInfo> pLMNInfoList; - - public Integer getNearRTRICId() { - return nearRTRICId; - } - - public void setNearRTRICId(Integer nearRTRICId) { - this.nearRTRICId = nearRTRICId; - } - - public Integer getgNBId() { - return gNBId; - } - - public void setgNBId(Integer gNBId) { - this.gNBId = gNBId; - } - - public List<String> getTrackingArea() { - return trackingArea; - } - - public void setTrackingArea(List<String> trackingArea) { - this.trackingArea = trackingArea; - } - - public String getResourceType() { - return resourceType; - } - - public void setResourceType(String resourceType) { - this.resourceType = resourceType; - } - - public List<GNBCUCPFunction> getgNBCUCPList() { - return gNBCUCPList; - } - - public void setgNBCUCPList(List<GNBCUCPFunction> gNBCUCPList) { - this.gNBCUCPList = gNBCUCPList; - } - - public List<GNBCUUPFunction> getgNBCUUPList() { - return gNBCUUPList; - } - - public void setgNBCUUPList(List<GNBCUUPFunction> gNBCUUPList) { - this.gNBCUUPList = gNBCUUPList; - } - - public List<GNBDUFunction> getgNBDUList() { - return gNBDUList; - } - - public void setgNBDUList(List<GNBDUFunction> gNBDUList) { - this.gNBDUList = gNBDUList; - } - - public List<PLMNInfo> getpLMNInfoList() { - return pLMNInfoList; - } - - public void setpLMNInfoList(List<PLMNInfo> pLMNInfoList) { - this.pLMNInfoList = pLMNInfoList; - } - - public List<String> getRanNFNSSIList() { - return ranNFNSSIList; - } - - public void setRanNFNSSIList(List<String> ranNFNSSIList) { - this.ranNFNSSIList = ranNFNSSIList; - } + private static final long serialVersionUID = 1L; + @Id + @Column(name = "NEARRTRICID") + private Integer nearRTRICId; + @Column(name = "GNBID") + private Integer gNBId; + @ElementCollection(targetClass = String.class) + @CollectionTable(name = "TRACKINGAREA", joinColumns = @JoinColumn(name = "nearrtricid")) + private List<String> trackingArea; + @Column(name = "RESOURCETYPE") + private String resourceType; + @OneToMany(mappedBy = "nearRTRIC", cascade = CascadeType.ALL) + private List<GNBCUCPFunction> gNBCUCPList; + @OneToMany(mappedBy = "nearRTRIC", cascade = CascadeType.ALL) + private List<GNBCUUPFunction> gNBCUUPList; + @OneToMany(mappedBy = "nearRTRIC", cascade = CascadeType.ALL) + private List<GNBDUFunction> gNBDUList; + @ElementCollection(targetClass = String.class) + @CollectionTable(name = "RANNFNSSI", joinColumns = @JoinColumn(name = "nearrtricid")) + private List<String> ranNFNSSIList; + @ElementCollection + @CollectionTable(name = "PLMNINFO", joinColumns = @JoinColumn(name = "nearrtricid")) + private List<PLMNInfo> pLMNInfoList; + + public Integer getNearRTRICId() { + return nearRTRICId; + } + + public void setNearRTRICId(Integer nearRTRICId) { + this.nearRTRICId = nearRTRICId; + } + + public Integer getgNBId() { + return gNBId; + } + + public void setgNBId(Integer gNBId) { + this.gNBId = gNBId; + } + + public List<String> getTrackingArea() { + return trackingArea; + } + + public void setTrackingArea(List<String> trackingArea) { + this.trackingArea = trackingArea; + } + + public String getResourceType() { + return resourceType; + } + + public void setResourceType(String resourceType) { + this.resourceType = resourceType; + } + + public List<GNBCUCPFunction> getgNBCUCPList() { + return gNBCUCPList; + } + + public void setgNBCUCPList(List<GNBCUCPFunction> gNBCUCPList) { + this.gNBCUCPList = gNBCUCPList; + } + + public List<GNBCUUPFunction> getgNBCUUPList() { + return gNBCUUPList; + } + + public void setgNBCUUPList(List<GNBCUUPFunction> gNBCUUPList) { + this.gNBCUUPList = gNBCUUPList; + } + + public List<GNBDUFunction> getgNBDUList() { + return gNBDUList; + } + + public void setgNBDUList(List<GNBDUFunction> gNBDUList) { + this.gNBDUList = gNBDUList; + } + + public List<PLMNInfo> getpLMNInfoList() { + return pLMNInfoList; + } + + public void setpLMNInfoList(List<PLMNInfo> pLMNInfoList) { + this.pLMNInfoList = pLMNInfoList; + } + + public List<String> getRanNFNSSIList() { + return ranNFNSSIList; + } + + public void setRanNFNSSIList(List<String> ranNFNSSIList) { + this.ranNFNSSIList = ranNFNSSIList; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NeighborDetails.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NeighborDetails.java index 4af3166..28764e9 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NeighborDetails.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NeighborDetails.java @@ -17,6 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.ransim.rest.api.models; import javax.persistence.EmbeddedId; @@ -27,35 +28,35 @@ import javax.persistence.Table; @Table(name = "NeighborDetails") public class NeighborDetails { - @EmbeddedId - private NeihborId neigbor; + @EmbeddedId + private NeihborId neigbor; - private boolean blacklisted; + private boolean blacklisted; - public NeighborDetails() { + public NeighborDetails() { - } + } - public NeighborDetails(NeihborId neigbor, boolean blacklisted) { - super(); - this.neigbor = neigbor; - this.blacklisted = blacklisted; - } + public NeighborDetails(NeihborId neigbor, boolean blacklisted) { + super(); + this.neigbor = neigbor; + this.blacklisted = blacklisted; + } - public NeihborId getNeigbor() { - return neigbor; - } + public NeihborId getNeigbor() { + return neigbor; + } - public void setNeigbor(NeihborId neigbor) { - this.neigbor = neigbor; - } + public void setNeigbor(NeihborId neigbor) { + this.neigbor = neigbor; + } - public boolean isBlacklisted() { - return blacklisted; - } + public boolean isBlacklisted() { + return blacklisted; + } - public void setBlacklisted(boolean blacklisted) { - this.blacklisted = blacklisted; - } + public void setBlacklisted(boolean blacklisted) { + this.blacklisted = blacklisted; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NeighborPmDetails.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NeighborPmDetails.java index a18a55b..c2f9384 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NeighborPmDetails.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NeighborPmDetails.java @@ -17,48 +17,49 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.ransim.rest.api.models; public class NeighborPmDetails { - private String nbrCellId; - private String kpiName; - private int kpiValue; + private String nbrCellId; + private String kpiName; + private int kpiValue; - public NeighborPmDetails(String nbrCellId, String kpiName, int kpiValue) { - super(); - this.nbrCellId = nbrCellId; - this.kpiName = kpiName; - this.kpiValue = kpiValue; - } + public NeighborPmDetails(String nbrCellId, String kpiName, int kpiValue) { + super(); + this.nbrCellId = nbrCellId; + this.kpiName = kpiName; + this.kpiValue = kpiValue; + } - public NeighborPmDetails() { - super(); - // TODO Auto-generated constructor stub - } + public NeighborPmDetails() { + super(); + // TODO Auto-generated constructor stub + } - public String getNbrCellId() { - return nbrCellId; - } + public String getNbrCellId() { + return nbrCellId; + } - public void setNbrCellId(String nbrCellId) { - this.nbrCellId = nbrCellId; - } + public void setNbrCellId(String nbrCellId) { + this.nbrCellId = nbrCellId; + } - public String getKpiName() { - return kpiName; - } + public String getKpiName() { + return kpiName; + } - public void setKpiName(String kpiName) { - this.kpiName = kpiName; - } + public void setKpiName(String kpiName) { + this.kpiName = kpiName; + } - public int getKpiValue() { - return kpiValue; - } + public int getKpiValue() { + return kpiValue; + } - public void setKpiValue(int kpiValue) { - this.kpiValue = kpiValue; - } + public void setKpiValue(int kpiValue) { + this.kpiValue = kpiValue; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NeihborId.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NeihborId.java index 3bef66d..92b8771 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NeihborId.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NeihborId.java @@ -17,6 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.ransim.rest.api.models; import java.io.Serializable; @@ -26,65 +27,65 @@ import javax.persistence.Embeddable; @Embeddable public class NeihborId implements Serializable { - - private static final long serialVersionUID = 1L; - @Column(name = "sourceCellNodeId") - private String sourceCellNodeId; + private static final long serialVersionUID = 1L; + + @Column(name = "sourceCellNodeId") + private String sourceCellNodeId; - @Column(name = "neighborCellNodeId") - private String neighborCell; + @Column(name = "neighborCellNodeId") + private String neighborCell; - public NeihborId() { - } + public NeihborId() { + } - public NeihborId(String sourceCellNodeId, String neighborCell) { - this.sourceCellNodeId = sourceCellNodeId; - this.neighborCell = neighborCell; - } + public NeihborId(String sourceCellNodeId, String neighborCell) { + this.sourceCellNodeId = sourceCellNodeId; + this.neighborCell = neighborCell; + } - public String getSourceCellNodeId() { - return sourceCellNodeId; - } + public String getSourceCellNodeId() { + return sourceCellNodeId; + } - public String getNeighborCell() { - return neighborCell; - } + public String getNeighborCell() { + return neighborCell; + } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((neighborCell == null) ? 0 : neighborCell.hashCode()); - result = prime * result + ((sourceCellNodeId == null) ? 0 : sourceCellNodeId.hashCode()); - return result; - } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((neighborCell == null) ? 0 : neighborCell.hashCode()); + result = prime * result + ((sourceCellNodeId == null) ? 0 : sourceCellNodeId.hashCode()); + return result; + } - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - NeihborId other = (NeihborId) obj; - if (neighborCell == null) { - if (other.neighborCell != null) { - return false; - } - } else if (!neighborCell.equals(other.neighborCell)) - return false; - if (sourceCellNodeId == null) { - if (other.sourceCellNodeId != null) { - return false; - } - } else if (!sourceCellNodeId.equals(other.sourceCellNodeId)) { - return false; - } - return true; - } -}
\ No newline at end of file + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + NeihborId other = (NeihborId) obj; + if (neighborCell == null) { + if (other.neighborCell != null) { + return false; + } + } else if (!neighborCell.equals(other.neighborCell)) + return false; + if (sourceCellNodeId == null) { + if (other.sourceCellNodeId != null) { + return false; + } + } else if (!sourceCellNodeId.equals(other.sourceCellNodeId)) { + return false; + } + return true; + } +} 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 e0a1dc9..a33f616 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 @@ -25,8 +25,8 @@ import java.util.Set; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Id; import javax.persistence.FetchType; +import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; @@ -34,66 +34,66 @@ import javax.persistence.Table; @Table(name = "NetconfServers") public class NetconfServers { - @Id - @Column(name = "serverId", unique = true, nullable = false, length = 20) - private String serverId; - - private String ip; - private String netconfPort; - - @OneToMany(targetEntity = CellDetails.class,fetch = FetchType.EAGER, cascade = CascadeType.ALL) - private Set<CellDetails> cells; - - public NetconfServers() { - - } - - /** - * A constructor for Netconf server table class. - * - * @param serverId server Id of the netconf server - * @param ip ip address of the netconf server - * @param netconfPort port number of the netconf server - * @param cells List of cells belonging to the netconf server - */ - public NetconfServers(String serverId, String ip, String netconfPort, Set<CellDetails> cells) { - super(); - this.serverId = serverId; - this.ip = ip; - this.netconfPort = netconfPort; - this.cells = cells; - } - - public String getServerId() { - return serverId; - } - - public void setServerId(String serverId) { - this.serverId = serverId; - } - - public String getIp() { - return ip; - } - - public void setIp(String ip) { - this.ip = ip; - } - - public String getNetconfPort() { - return netconfPort; - } - - public void setNetconfPort(String netconfPort) { - this.netconfPort = netconfPort; - } - - public Set<CellDetails> getCells() { - return cells; - } - - public void setCells(Set<CellDetails> cells) { - this.cells = cells; - } + @Id + @Column(name = "serverId", unique = true, nullable = false, length = 20) + private String serverId; + + private String ip; + private String netconfPort; + + @OneToMany(targetEntity = CellDetails.class, fetch = FetchType.EAGER, cascade = CascadeType.ALL) + private Set<CellDetails> cells; + + public NetconfServers() { + + } + + /** + * A constructor for Netconf server table class. + * + * @param serverId server Id of the netconf server + * @param ip ip address of the netconf server + * @param netconfPort port number of the netconf server + * @param cells List of cells belonging to the netconf server + */ + public NetconfServers(String serverId, String ip, String netconfPort, Set<CellDetails> cells) { + super(); + this.serverId = serverId; + this.ip = ip; + this.netconfPort = netconfPort; + this.cells = cells; + } + + public String getServerId() { + return serverId; + } + + public void setServerId(String serverId) { + this.serverId = serverId; + } + + public String getIp() { + return ip; + } + + public void setIp(String ip) { + this.ip = ip; + } + + public String getNetconfPort() { + return netconfPort; + } + + public void setNetconfPort(String netconfPort) { + this.netconfPort = netconfPort; + } + + public Set<CellDetails> getCells() { + return cells; + } + + public void setCells(Set<CellDetails> cells) { + this.cells = cells; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/OperationLog.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/OperationLog.java index 5d6e82e..86a83de 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/OperationLog.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/OperationLog.java @@ -20,83 +20,83 @@ package org.onap.ransim.rest.api.models; +import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Id; import javax.persistence.GeneratedValue; -import javax.persistence.Column; import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; @Entity @Table(name = "OperationLog") public class OperationLog { - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - private int rowId; - private long time; - private String nodeId; - private String source; - - @Column(name = "message", length = 300) - private String message; - private String fieldName; - private String operation; - - public int getRowId() { - return rowId; - } - - public void setRowId(int rowId) { - this.rowId = rowId; - } - - public long getTime() { - return time; - } - - public String getSource() { - return source; - } - - public void setSource(String source) { - this.source = source; - } - - public void setTime(long time) { - this.time = time; - } - - public String getNodeId() { - return nodeId; - } - - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public String getFieldName() { - return fieldName; - } - - public void setFieldName(String fieldName) { - this.fieldName = fieldName; - } - - public String getOperation() { - return operation; - } - - public void setOperation(String operation) { - this.operation = operation; - } + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private int rowId; + private long time; + private String nodeId; + private String source; + + @Column(name = "message", length = 300) + private String message; + private String fieldName; + private String operation; + + public int getRowId() { + return rowId; + } + + public void setRowId(int rowId) { + this.rowId = rowId; + } + + public long getTime() { + return time; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public void setTime(long time) { + this.time = time; + } + + public String getNodeId() { + return nodeId; + } + + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public String getFieldName() { + return fieldName; + } + + public void setFieldName(String fieldName) { + this.fieldName = fieldName; + } + + public String getOperation() { + return operation; + } + + public void setOperation(String operation) { + this.operation = operation; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/PLMNInfo.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/PLMNInfo.java index a45ad77..a7121bd 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/PLMNInfo.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/PLMNInfo.java @@ -36,28 +36,28 @@ import javax.persistence.Table; @Embeddable @Table(name = "PLMNINFO") public class PLMNInfo implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - @Column(name = "PLMNID") - private String pLMNId; + @Column(name = "PLMNID") + private String pLMNId; - @Embedded - private SNSSAI sNSSAI; + @Embedded + private SNSSAI sNSSAI; - public String getpLMNId() { - return pLMNId; - } + public String getpLMNId() { + return pLMNId; + } - public void setpLMNId(String pLMNId) { - this.pLMNId = pLMNId; - } + public void setpLMNId(String pLMNId) { + this.pLMNId = pLMNId; + } - public SNSSAI getsNSSAI() { - return sNSSAI; - } + public SNSSAI getsNSSAI() { + return sNSSAI; + } - public void setsNSSAI(SNSSAI sNSSAI) { - this.sNSSAI = sNSSAI; - } + public void setsNSSAI(SNSSAI sNSSAI) { + this.sNSSAI = sNSSAI; + } } 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 af16d44..fd674bc 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 @@ -21,94 +21,93 @@ package org.onap.ransim.rest.api.models; public class PLMNInfoModel { - private String pLMNId; - private String snssai; - private String status; - private String gnbType; - private int gnbId; - private int nrCellId; - private String nearrtricid; - private long maxNumberOfConns; - - public PLMNInfoModel() { - - } - - public PLMNInfoModel(String pLMNId, String snssai, String status, String gnbType, int gnbId, int nrCellId, - String nearrtricid, long maxNumberOfConns) { - super(); - this.pLMNId = pLMNId; - this.snssai = snssai; - this.status = status; - this.gnbType = gnbType; - this.gnbId = gnbId; - this.nrCellId = nrCellId; - this.nearrtricid = nearrtricid; - this.maxNumberOfConns = maxNumberOfConns; - } - - public String getpLMNId() { - return pLMNId; - } - - public void setpLMNId(String pLMNId) { - this.pLMNId = pLMNId; - } - - public String getSnssai() { - return snssai; - } - - public void setSnssai(String snssai) { - this.snssai = snssai; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getGnbType() { - return gnbType; - } - - public void setGnbType(String gnbType) { - this.gnbType = gnbType; - } - - public int getGnbId() { - return gnbId; - } - - public void setGnbId(int gnbId) { - this.gnbId = gnbId; - } - - public int getNrCellId() { - return nrCellId; - } - - public void setNrCellId(int nrCellId) { - this.nrCellId = nrCellId; - } - - public String getNearrtricid() { - return nearrtricid; - } - - public void setNearrtricid(String nearrtricid) { - this.nearrtricid = nearrtricid; - } - - public long getMaxNumberOfConns() { - return maxNumberOfConns; - } - - public void setMaxNumberOfConns(long maxNumberOfConns) { - this.maxNumberOfConns = maxNumberOfConns; - } + private String pLMNId; + private String snssai; + private String status; + private String gnbType; + private int gnbId; + private int nrCellId; + private String nearrtricid; + private long maxNumberOfConns; + + public PLMNInfoModel() { + + } + + public PLMNInfoModel(String pLMNId, String snssai, String status, String gnbType, int gnbId, int nrCellId, + String nearrtricid, long maxNumberOfConns) { + super(); + this.pLMNId = pLMNId; + this.snssai = snssai; + this.status = status; + this.gnbType = gnbType; + this.gnbId = gnbId; + this.nrCellId = nrCellId; + this.nearrtricid = nearrtricid; + this.maxNumberOfConns = maxNumberOfConns; + } + + public String getpLMNId() { + return pLMNId; + } + + public void setpLMNId(String pLMNId) { + this.pLMNId = pLMNId; + } + + public String getSnssai() { + return snssai; + } + + public void setSnssai(String snssai) { + this.snssai = snssai; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getGnbType() { + return gnbType; + } + + public void setGnbType(String gnbType) { + this.gnbType = gnbType; + } + + public int getGnbId() { + return gnbId; + } + + public void setGnbId(int gnbId) { + this.gnbId = gnbId; + } + + public int getNrCellId() { + return nrCellId; + } + + public void setNrCellId(int nrCellId) { + this.nrCellId = nrCellId; + } + + public String getNearrtricid() { + return nearrtricid; + } + + public void setNearrtricid(String nearrtricid) { + this.nearrtricid = nearrtricid; + } + + public long getMaxNumberOfConns() { + return maxNumberOfConns; + } + + public void setMaxNumberOfConns(long maxNumberOfConns) { + this.maxNumberOfConns = maxNumberOfConns; + } } - diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/PmDataDump.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/PmDataDump.java index 9f0ad6e..6b273ae 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/PmDataDump.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/PmDataDump.java @@ -24,24 +24,24 @@ import java.util.List; public class PmDataDump { - private List<PmParameters> kpiDump; + private List<PmParameters> kpiDump; - public PmDataDump() { - super(); - // TODO Auto-generated constructor stub - } + public PmDataDump() { + super(); + // TODO Auto-generated constructor stub + } - public PmDataDump(List<PmParameters> kpiDump) { - super(); - this.kpiDump = kpiDump; - } + public PmDataDump(List<PmParameters> kpiDump) { + super(); + this.kpiDump = kpiDump; + } - public List<PmParameters> getKpiDump() { - return kpiDump; - } + public List<PmParameters> getKpiDump() { + return kpiDump; + } - public void setKpiDump(List<PmParameters> kpiDump) { - this.kpiDump = kpiDump; - } + public void setKpiDump(List<PmParameters> kpiDump) { + this.kpiDump = kpiDump; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/PmParameters.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/PmParameters.java index 6ff4721..3e368d4 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/PmParameters.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/PmParameters.java @@ -22,77 +22,77 @@ package org.onap.ransim.rest.api.models; public class PmParameters { - private String parameter1; - private String successValue1; - private String badValue1; - private String poorValue1; - private String parameter2; - private String successValue2; - private String badValue2; - private String poorValue2; - - public String getParameter1() { - return parameter1; - } - - public void setParameter1(String parameter1) { - this.parameter1 = parameter1; - } - - public String getSuccessValue1() { - return successValue1; - } - - public void setSuccessValue1(String successValue1) { - this.successValue1 = successValue1; - } - - public String getBadValue1() { - return badValue1; - } - - public void setBadValue1(String badValue1) { - this.badValue1 = badValue1; - } - - public String getPoorValue1() { - return poorValue1; - } - - public void setPoorValue1(String poorValue1) { - this.poorValue1 = poorValue1; - } - - public String getParameter2() { - return parameter2; - } - - public void setParameter2(String parameter2) { - this.parameter2 = parameter2; - } - - public String getSuccessValue2() { - return successValue2; - } - - public void setSuccessValue2(String successValue2) { - this.successValue2 = successValue2; - } - - public String getBadValue2() { - return badValue2; - } - - public void setBadValue2(String badValue2) { - this.badValue2 = badValue2; - } - - public String getPoorValue2() { - return poorValue2; - } - - public void setPoorValue2(String poorValue2) { - this.poorValue2 = poorValue2; - } + private String parameter1; + private String successValue1; + private String badValue1; + private String poorValue1; + private String parameter2; + private String successValue2; + private String badValue2; + private String poorValue2; + + public String getParameter1() { + return parameter1; + } + + public void setParameter1(String parameter1) { + this.parameter1 = parameter1; + } + + public String getSuccessValue1() { + return successValue1; + } + + public void setSuccessValue1(String successValue1) { + this.successValue1 = successValue1; + } + + public String getBadValue1() { + return badValue1; + } + + public void setBadValue1(String badValue1) { + this.badValue1 = badValue1; + } + + public String getPoorValue1() { + return poorValue1; + } + + public void setPoorValue1(String poorValue1) { + this.poorValue1 = poorValue1; + } + + public String getParameter2() { + return parameter2; + } + + public void setParameter2(String parameter2) { + this.parameter2 = parameter2; + } + + public String getSuccessValue2() { + return successValue2; + } + + public void setSuccessValue2(String successValue2) { + this.successValue2 = successValue2; + } + + public String getBadValue2() { + return badValue2; + } + + public void setBadValue2(String badValue2) { + this.badValue2 = badValue2; + } + + public String getPoorValue2() { + return poorValue2; + } + + public void setPoorValue2(String poorValue2) { + this.poorValue2 = poorValue2; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/RANSliceInfo.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/RANSliceInfo.java index 5ec30c8..b42cd51 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/RANSliceInfo.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/RANSliceInfo.java @@ -22,6 +22,7 @@ package org.onap.ransim.rest.api.models; import java.io.Serializable; import java.util.List; + import javax.persistence.CascadeType; import javax.persistence.CollectionTable; import javax.persistence.Column; @@ -35,106 +36,106 @@ import javax.persistence.Table; @Entity(name = "RANINVENTORY") @Table(name = "RANINVENTORY") public class RANSliceInfo implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Column(name = "RANNFNSSIID") - private String ranNFNSSIId; - @ElementCollection - @CollectionTable(name = "rannssi", joinColumns = @JoinColumn(name = "rannfnssiid")) - private List<String> ranNSSIList; - @ElementCollection - @CollectionTable(name = "nssai", joinColumns = @JoinColumn(name = "rannfnssiid")) - private List<String> nSSAIList; - @OneToMany(mappedBy = "rANSliceInventory", cascade = CascadeType.ALL) - private List<SliceProfile> sliceProfilesList; - @Column(name = "TALIST") - private String trackingAreaList; - @Column(name = "SUBNETSTATUS") - private String subnetStatus; - @Column(name = "NSSTID") - private String nsstId; - @Column(name = "SLICETYPE") - private String sliceType; - @Column(name = "ISSHAREABLE") - private String isShareable; - - public String getRanNFNSSIId() { - return ranNFNSSIId; - } - - public void setRanNFNSSIId(String ranNFNSSIId) { - this.ranNFNSSIId = ranNFNSSIId; - } - - public List<String> getRanNSSIList() { - return ranNSSIList; - } - - public void setRanNSSIList(List<String> ranNSSIList) { - this.ranNSSIList = ranNSSIList; - } - - public List<SliceProfile> getSliceProfilesList() { - return sliceProfilesList; - } - - public void setSliceProfilesList(List<SliceProfile> sliceProfilesList) { - this.sliceProfilesList = sliceProfilesList; - } - - public String getSubnetStatus() { - return subnetStatus; - } - - public void setSubnetStatus(String subnetStatus) { - this.subnetStatus = subnetStatus; - } - - public String getNsstId() { - return nsstId; - } - - public void setNsstId(String nsstId) { - this.nsstId = nsstId; - } - - public String getSliceType() { - return sliceType; - } - - public void setSliceType(String sliceType) { - this.sliceType = sliceType; - } - - public String getIsShareable() { - return isShareable; - } - - public void setIsShareable(String isShareable) { - this.isShareable = isShareable; - } - - public List<String> getnSSAIList() { - return nSSAIList; - } - - public void setnSSAIList(List<String> nSSAIList) { - this.nSSAIList = nSSAIList; - } - - public String getTrackingAreaList() { - return trackingAreaList; - } - - public void setTrackingAreaList(String trackingAreaList) { - this.trackingAreaList = trackingAreaList; - } - - @Override - public String toString() { - return "RANSliceInfo [ranNFNSSIId=" + ranNFNSSIId + ", ranNSSIList=" + ranNSSIList + ", nSSAIList=" + nSSAIList - + ", sliceProfilesList=" + sliceProfilesList + ", trackingAreaList=" + trackingAreaList - + ", subnetStatus=" + subnetStatus + ", nsstId=" + nsstId + ", sliceType=" + sliceType - + ", isShareable=" + isShareable + "]"; - } + private static final long serialVersionUID = 1L; + @Id + @Column(name = "RANNFNSSIID") + private String ranNFNSSIId; + @ElementCollection + @CollectionTable(name = "rannssi", joinColumns = @JoinColumn(name = "rannfnssiid")) + private List<String> ranNSSIList; + @ElementCollection + @CollectionTable(name = "nssai", joinColumns = @JoinColumn(name = "rannfnssiid")) + private List<String> nSSAIList; + @OneToMany(mappedBy = "rANSliceInventory", cascade = CascadeType.ALL) + private List<SliceProfile> sliceProfilesList; + @Column(name = "TALIST") + private String trackingAreaList; + @Column(name = "SUBNETSTATUS") + private String subnetStatus; + @Column(name = "NSSTID") + private String nsstId; + @Column(name = "SLICETYPE") + private String sliceType; + @Column(name = "ISSHAREABLE") + private String isShareable; + + public String getRanNFNSSIId() { + return ranNFNSSIId; + } + + public void setRanNFNSSIId(String ranNFNSSIId) { + this.ranNFNSSIId = ranNFNSSIId; + } + + public List<String> getRanNSSIList() { + return ranNSSIList; + } + + public void setRanNSSIList(List<String> ranNSSIList) { + this.ranNSSIList = ranNSSIList; + } + + public List<SliceProfile> getSliceProfilesList() { + return sliceProfilesList; + } + + public void setSliceProfilesList(List<SliceProfile> sliceProfilesList) { + this.sliceProfilesList = sliceProfilesList; + } + + public String getSubnetStatus() { + return subnetStatus; + } + + public void setSubnetStatus(String subnetStatus) { + this.subnetStatus = subnetStatus; + } + + public String getNsstId() { + return nsstId; + } + + public void setNsstId(String nsstId) { + this.nsstId = nsstId; + } + + public String getSliceType() { + return sliceType; + } + + public void setSliceType(String sliceType) { + this.sliceType = sliceType; + } + + public String getIsShareable() { + return isShareable; + } + + public void setIsShareable(String isShareable) { + this.isShareable = isShareable; + } + + public List<String> getnSSAIList() { + return nSSAIList; + } + + public void setnSSAIList(List<String> nSSAIList) { + this.nSSAIList = nSSAIList; + } + + public String getTrackingAreaList() { + return trackingAreaList; + } + + public void setTrackingAreaList(String trackingAreaList) { + this.trackingAreaList = trackingAreaList; + } + + @Override + public String toString() { + return "RANSliceInfo [ranNFNSSIId=" + ranNFNSSIId + ", ranNSSIList=" + ranNSSIList + ", nSSAIList=" + nSSAIList + + ", sliceProfilesList=" + sliceProfilesList + ", trackingAreaList=" + trackingAreaList + + ", subnetStatus=" + subnetStatus + ", nsstId=" + nsstId + ", sliceType=" + sliceType + + ", isShareable=" + isShareable + "]"; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/RRMPolicyMember.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/RRMPolicyMember.java index aced9cf..7e8d1bb 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/RRMPolicyMember.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/RRMPolicyMember.java @@ -21,6 +21,7 @@ package org.onap.ransim.rest.api.models; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; @@ -30,36 +31,36 @@ import javax.persistence.Table; @Entity @Table(name = "RRMPOLICYMEMBER") public class RRMPolicyMember implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Column(name = "PLMNID") - private String pLMNId; - @Column(name = "SNSSAI") - private String sNSSAI; - @ManyToOne - private RRMPolicyRatio rrmPolicy; + private static final long serialVersionUID = 1L; + @Id + @Column(name = "PLMNID") + private String pLMNId; + @Column(name = "SNSSAI") + private String sNSSAI; + @ManyToOne + private RRMPolicyRatio rrmPolicy; - public String getpLMNId() { - return pLMNId; - } + public String getpLMNId() { + return pLMNId; + } - public void setpLMNId(String pLMNId) { - this.pLMNId = pLMNId; - } + public void setpLMNId(String pLMNId) { + this.pLMNId = pLMNId; + } - public String getsNSSAI() { - return sNSSAI; - } + public String getsNSSAI() { + return sNSSAI; + } - public void setsNSSAI(String sNSSAI) { - this.sNSSAI = sNSSAI; - } + public void setsNSSAI(String sNSSAI) { + this.sNSSAI = sNSSAI; + } - public RRMPolicyRatio getRrmPolicy() { - return rrmPolicy; - } + public RRMPolicyRatio getRrmPolicy() { + return rrmPolicy; + } - public void setRrmPolicy(RRMPolicyRatio rrmPolicy) { - this.rrmPolicy = rrmPolicy; - } + public void setRrmPolicy(RRMPolicyRatio rrmPolicy) { + this.rrmPolicy = rrmPolicy; + } } 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 27c5d9c..33546c3 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 @@ -22,6 +22,7 @@ package org.onap.ransim.rest.api.models; import java.io.Serializable; import java.util.List; + import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.ElementCollection; @@ -33,98 +34,97 @@ import javax.persistence.Table; @Entity @Table(name = "RRMPOLICYRATIO") public class RRMPolicyRatio implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Column(name = "RRMPOLICYID") - private Integer rrmPolicyID; - @Column(name = "RESOURCEID") - private String resourceID; - @Column(name = "RESOURCETYPE") - private String resourceType; - @Column(name = "SLICETYPE") - private String sliceType; -// @OneToMany(mappedBy = "rrmPolicy", cascade={CascadeType.PERSIST,CascadeType.REMOVE}) - @OneToMany(mappedBy = "rrmPolicy", cascade = CascadeType.ALL) - private List<RRMPolicyMember> rRMPolicyMemberList; - @Column(name = "QUOTATYPE") - private String quotaType; - @Column(name = "RRMPOLICYMAXRATIO") - private Integer rRMPolicyMaxRatio; - @Column(name = "RRMPOLICYMINRATIO") - private Integer rRMPolicyMinRatio; - @Column(name = "RRMPOLICYDEDICATEDRATIO") - private Integer rRMPolicyDedicatedRatio; - - public Integer getRrmPolicyID() { - return rrmPolicyID; - } - - public void setRrmPolicyID(Integer rrmPolicyID) { - this.rrmPolicyID = rrmPolicyID; - } - - public String getResourceID() { - return resourceID; - } - - public void setResourceID(String resourceID) { - this.resourceID = resourceID; - } - - public String getResourceType() { - return resourceType; - } - - public void setResourceType(String resourceType) { - this.resourceType = resourceType; - } - - public String getSliceType() { - return sliceType; - } - - public void setSliceType(String sliceType) { - this.sliceType = sliceType; - } - - public List<RRMPolicyMember> getrRMPolicyMemberList() { - return rRMPolicyMemberList; - } - - public void setrRMPolicyMemberList(List<RRMPolicyMember> rRMPolicyMemberList) { - this.rRMPolicyMemberList = rRMPolicyMemberList; - } - - public String getQuotaType() { - return quotaType; - } - - public void setQuotaType(String quotaType) { - this.quotaType = quotaType; - } - - public Integer getrRMPolicyMaxRatio() { - return rRMPolicyMaxRatio; - } - - public void setrRMPolicyMaxRatio(Integer rRMPolicyMaxRatio) { - this.rRMPolicyMaxRatio = rRMPolicyMaxRatio; - } - - public Integer getrRMPolicyMinRatio() { - return rRMPolicyMinRatio; - } - - public void setrRMPolicyMinRatio(Integer rRMPolicyMinRatio) { - this.rRMPolicyMinRatio = rRMPolicyMinRatio; - } - - public Integer getrRMPolicyDedicatedRatio() { - return rRMPolicyDedicatedRatio; - } - - public void setrRMPolicyDedicatedRatio(Integer rRMPolicyDedicatedRatio) { - this.rRMPolicyDedicatedRatio = rRMPolicyDedicatedRatio; - } + private static final long serialVersionUID = 1L; + @Id + @Column(name = "RRMPOLICYID") + private Integer rrmPolicyID; + @Column(name = "RESOURCEID") + private String resourceID; + @Column(name = "RESOURCETYPE") + private String resourceType; + @Column(name = "SLICETYPE") + private String sliceType; + // @OneToMany(mappedBy = "rrmPolicy", cascade={CascadeType.PERSIST,CascadeType.REMOVE}) + @OneToMany(mappedBy = "rrmPolicy", cascade = CascadeType.ALL) + private List<RRMPolicyMember> rRMPolicyMemberList; + @Column(name = "QUOTATYPE") + private String quotaType; + @Column(name = "RRMPOLICYMAXRATIO") + private Integer rRMPolicyMaxRatio; + @Column(name = "RRMPOLICYMINRATIO") + private Integer rRMPolicyMinRatio; + @Column(name = "RRMPOLICYDEDICATEDRATIO") + private Integer rRMPolicyDedicatedRatio; + + public Integer getRrmPolicyID() { + return rrmPolicyID; + } + + public void setRrmPolicyID(Integer rrmPolicyID) { + this.rrmPolicyID = rrmPolicyID; + } + + public String getResourceID() { + return resourceID; + } + + public void setResourceID(String resourceID) { + this.resourceID = resourceID; + } + + public String getResourceType() { + return resourceType; + } + + public void setResourceType(String resourceType) { + this.resourceType = resourceType; + } + + public String getSliceType() { + return sliceType; + } + + public void setSliceType(String sliceType) { + this.sliceType = sliceType; + } + + public List<RRMPolicyMember> getrRMPolicyMemberList() { + return rRMPolicyMemberList; + } + + public void setrRMPolicyMemberList(List<RRMPolicyMember> rRMPolicyMemberList) { + this.rRMPolicyMemberList = rRMPolicyMemberList; + } + + public String getQuotaType() { + return quotaType; + } + + public void setQuotaType(String quotaType) { + this.quotaType = quotaType; + } + + public Integer getrRMPolicyMaxRatio() { + return rRMPolicyMaxRatio; + } + + public void setrRMPolicyMaxRatio(Integer rRMPolicyMaxRatio) { + this.rRMPolicyMaxRatio = rRMPolicyMaxRatio; + } + + public Integer getrRMPolicyMinRatio() { + return rRMPolicyMinRatio; + } + + public void setrRMPolicyMinRatio(Integer rRMPolicyMinRatio) { + this.rRMPolicyMinRatio = rRMPolicyMinRatio; + } + + public Integer getrRMPolicyDedicatedRatio() { + return rRMPolicyDedicatedRatio; + } + + public void setrRMPolicyDedicatedRatio(Integer rRMPolicyDedicatedRatio) { + this.rRMPolicyDedicatedRatio = rRMPolicyDedicatedRatio; + } } - diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/SNSSAI.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/SNSSAI.java index 1c35546..e33a871 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/SNSSAI.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/SNSSAI.java @@ -21,6 +21,7 @@ package org.onap.ransim.rest.api.models; import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Embeddable; import javax.persistence.Embedded; @@ -32,57 +33,57 @@ import javax.persistence.Table; @Embeddable @Table(name = "SNSSAI") public class SNSSAI implements Serializable { - private static final long serialVersionUID = 1L; - - @Column(name = "sNSSAI") - private String sNSSAI; - @Column(name = "STATUS") - private String status; - @Column(name = "GLOBALSUBSCRIBERID") - private String globalSubscriberId; - @Column(name = "SUBSCRIPTIONSERVICETYPE") - private String subscriptionServiceType; - @Embedded - private NSSAIConfig configData; - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getGlobalSubscriberId() { - return globalSubscriberId; - } - - public void setGlobalSubscriberId(String globalSubscriberId) { - this.globalSubscriberId = globalSubscriberId; - } - - public String getSubscriptionServiceType() { - return subscriptionServiceType; - } - - public void setSubscriptionServiceType(String subscriptionServiceType) { - this.subscriptionServiceType = subscriptionServiceType; - } - - public NSSAIConfig getConfigData() { - return configData; - } - - public void setConfigData(NSSAIConfig configData) { - this.configData = configData; - } - - public String getsNSSAI() { - return sNSSAI; - } - - public void setsNSSAI(String sNSSAI) { - this.sNSSAI = sNSSAI; - } + private static final long serialVersionUID = 1L; + + @Column(name = "sNSSAI") + private String sNSSAI; + @Column(name = "STATUS") + private String status; + @Column(name = "GLOBALSUBSCRIBERID") + private String globalSubscriberId; + @Column(name = "SUBSCRIPTIONSERVICETYPE") + private String subscriptionServiceType; + @Embedded + private NSSAIConfig configData; + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getGlobalSubscriberId() { + return globalSubscriberId; + } + + public void setGlobalSubscriberId(String globalSubscriberId) { + this.globalSubscriberId = globalSubscriberId; + } + + public String getSubscriptionServiceType() { + return subscriptionServiceType; + } + + public void setSubscriptionServiceType(String subscriptionServiceType) { + this.subscriptionServiceType = subscriptionServiceType; + } + + public NSSAIConfig getConfigData() { + return configData; + } + + public void setConfigData(NSSAIConfig configData) { + this.configData = configData; + } + + public String getsNSSAI() { + return sNSSAI; + } + + public void setsNSSAI(String sNSSAI) { + this.sNSSAI = sNSSAI; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/SetCollisionReq.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/SetCollisionReq.java index 1738e65..e3f95d6 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/SetCollisionReq.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/SetCollisionReq.java @@ -22,28 +22,28 @@ package org.onap.ransim.rest.api.models; public class SetCollisionReq { - private boolean collision; + private boolean collision; - /** - * A constructor for SetCollisionReq. - * - * @param collision to set if the new simulation has collision between the cells - */ - public SetCollisionReq(boolean collision) { - super(); - this.collision = collision; - } + /** + * A constructor for SetCollisionReq. + * + * @param collision to set if the new simulation has collision between the cells + */ + public SetCollisionReq(boolean collision) { + super(); + this.collision = collision; + } - public SetCollisionReq() { + public SetCollisionReq() { - } + } - public boolean isCollision() { - return collision; - } + public boolean isCollision() { + return collision; + } - public void setCollision(boolean collision) { - this.collision = collision; - } + public void setCollision(boolean collision) { + this.collision = collision; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/SetConstants.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/SetConstants.java index bd99dee..6116a8e 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/SetConstants.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/SetConstants.java @@ -22,87 +22,87 @@ package org.onap.ransim.rest.api.models; public class SetConstants { - private int gridSize; - private int gridType; - private boolean collision; - - private int processCapacity; - private int numberOfMachines; - private String serverIdPrefix; - - public SetConstants() { - - } - - /** - * A constructor for SetConstants. - * - * @param gridSize grid dimension for the topology (number of cells - * along the side) - * @param gridType honeycomb or square grid - * @param collision to set if the new simulation has collision between - * the cells - * @param processCapacity number of netconf servers - * @param numberOfMachines number of machines running in one netconf server - * @param serverIdPrefix server id prefix - */ - public SetConstants(int gridSize, int gridType, boolean collision, int processCapacity, int numberOfMachines, - String serverIdPrefix) { - super(); - this.gridSize = gridSize; - this.gridType = gridType; - this.collision = collision; - this.processCapacity = processCapacity; - this.numberOfMachines = numberOfMachines; - this.serverIdPrefix = serverIdPrefix; - } - - public int getGridSize() { - return gridSize; - } - - public void setGridSize(int gridSize) { - this.gridSize = gridSize; - } - - public int getGridType() { - return gridType; - } - - public void setGridType(int gridType) { - this.gridType = gridType; - } - - public boolean isCollision() { - return collision; - } - - public void setCollision(boolean collision) { - this.collision = collision; - } - - public int getProcessCapacity() { - return processCapacity; - } - - public void setProcessCapacity(int processCapacity) { - this.processCapacity = processCapacity; - } - - public int getNumberOfMachines() { - return numberOfMachines; - } - - public void setNumberOfMachines(int numberOfMachines) { - this.numberOfMachines = numberOfMachines; - } - - public String getServerIdPrefix() { - return serverIdPrefix; - } - - public void setServerIdPrefix(String serverIdPrefix) { - this.serverIdPrefix = serverIdPrefix; - } + private int gridSize; + private int gridType; + private boolean collision; + + private int processCapacity; + private int numberOfMachines; + private String serverIdPrefix; + + public SetConstants() { + + } + + /** + * A constructor for SetConstants. + * + * @param gridSize grid dimension for the topology (number of cells + * along the side) + * @param gridType honeycomb or square grid + * @param collision to set if the new simulation has collision between + * the cells + * @param processCapacity number of netconf servers + * @param numberOfMachines number of machines running in one netconf server + * @param serverIdPrefix server id prefix + */ + public SetConstants(int gridSize, int gridType, boolean collision, int processCapacity, int numberOfMachines, + String serverIdPrefix) { + super(); + this.gridSize = gridSize; + this.gridType = gridType; + this.collision = collision; + this.processCapacity = processCapacity; + this.numberOfMachines = numberOfMachines; + this.serverIdPrefix = serverIdPrefix; + } + + public int getGridSize() { + return gridSize; + } + + public void setGridSize(int gridSize) { + this.gridSize = gridSize; + } + + public int getGridType() { + return gridType; + } + + public void setGridType(int gridType) { + this.gridType = gridType; + } + + public boolean isCollision() { + return collision; + } + + public void setCollision(boolean collision) { + this.collision = collision; + } + + public int getProcessCapacity() { + return processCapacity; + } + + public void setProcessCapacity(int processCapacity) { + this.processCapacity = processCapacity; + } + + public int getNumberOfMachines() { + return numberOfMachines; + } + + public void setNumberOfMachines(int numberOfMachines) { + this.numberOfMachines = numberOfMachines; + } + + public String getServerIdPrefix() { + return serverIdPrefix; + } + + public void setServerIdPrefix(String serverIdPrefix) { + this.serverIdPrefix = serverIdPrefix; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/SliceProfile.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/SliceProfile.java index d8f280b..c65a22e 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/SliceProfile.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/SliceProfile.java @@ -22,6 +22,7 @@ package org.onap.ransim.rest.api.models; import java.io.Serializable; import java.util.List; + import javax.persistence.CollectionTable; import javax.persistence.Column; import javax.persistence.ElementCollection; @@ -34,141 +35,141 @@ import javax.persistence.Table; @Entity @Table(name = "SLICEPROFILE") public class SliceProfile implements Serializable { - private static final long serialVersionUID = 1L; - - @Id - @Column(name = "SLICEPROFILEID") - private String sliceProfileId; - @Column(name = "SNSSAI") - private String sNSSAI; - @Column(name = "PLMNIDLIST") - private String pLMNIdList; - @Column(name = "MAXNOOFUES") - private Integer maxNumberofUEs; - @Column(name = "LATENCY") - private Integer latency; - @Column(name = "DLTHPTPERSLICE") - private Integer dLThptPerSlice; - @Column(name = "ULTHPTPERSLICE") - private Integer uLThptPerSlice; - @Column(name = "MAXNUMBEROFCONNS") - private Integer maxNumberofConns; - - public Integer getdLThptPerSlice() { - return dLThptPerSlice; - } - - public void setdLThptPerSlice(Integer dLThptPerSlice) { - this.dLThptPerSlice = dLThptPerSlice; - } - - public Integer getuLThptPerSlice() { - return uLThptPerSlice; - } - - public void setuLThptPerSlice(Integer uLThptPerSlice) { - this.uLThptPerSlice = uLThptPerSlice; - } - - public Integer getMaxNumberofConns() { - return maxNumberofConns; - } - - public void setMaxNumberofConns(Integer maxNumberofConns) { - this.maxNumberofConns = maxNumberofConns; - } - - public String getCoverageAreaList() { - return coverageAreaList; - } - - /* - * @Column(name="EXPDATARATEDL") private Integer expDataRateDL; - * - * @Column(name="EXPDATARATEUL") private Integer expDataRateUL; - * - * @Column(name="MAXNUMBEROFPDUSESSIONS") private Integer - * maxNumberofPDUSessions; - */ - @Column(name = "UEMOBILITYLEVEL") - private String uEMobilityLevel; - @Column(name = "RESOURCESHARINGLEVEL") - private String resourceSharingLevel; - // @ElementCollection - // @CollectionTable(name="coveragearealist", joinColumns = - // @JoinColumn(name="sliceprofileid")) - @Column(name = "coveragearealist") - private String coverageAreaList; - @ManyToOne - @JoinColumn(name = "rannfnssiid") - private RANSliceInfo rANSliceInventory; - - public String getSliceProfileId() { - return sliceProfileId; - } - - public void setSliceProfileId(String sliceProfileId) { - this.sliceProfileId = sliceProfileId; - } - - public String getsNSSAI() { - return sNSSAI; - } - - public void setsNSSAI(String sNSSAI) { - this.sNSSAI = sNSSAI; - } - - public String getpLMNIdList() { - return pLMNIdList; - } - - public void setpLMNIdList(String pLMNIdList) { - this.pLMNIdList = pLMNIdList; - } - - public Integer getMaxNumberofUEs() { - return maxNumberofUEs; - } - - public void setMaxNumberofUEs(Integer maxNumberofUEs) { - this.maxNumberofUEs = maxNumberofUEs; - } - - public Integer getLatency() { - return latency; - } - - public void setLatency(Integer latency) { - this.latency = latency; - } - - public String getuEMobilityLevel() { - return uEMobilityLevel; - } - - public void setuEMobilityLevel(String uEMobilityLevel) { - this.uEMobilityLevel = uEMobilityLevel; - } - - public String getResourceSharingLevel() { - return resourceSharingLevel; - } - - public void setResourceSharingLevel(String resourceSharingLevel) { - this.resourceSharingLevel = resourceSharingLevel; - } - - public RANSliceInfo getrANSliceInventory() { - return rANSliceInventory; - } - - public void setrANSliceInventory(RANSliceInfo rANSliceInventory) { - this.rANSliceInventory = rANSliceInventory; - } - - public void setCoverageAreaList(String coverageAreaList) { - this.coverageAreaList = coverageAreaList; - } + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "SLICEPROFILEID") + private String sliceProfileId; + @Column(name = "SNSSAI") + private String sNSSAI; + @Column(name = "PLMNIDLIST") + private String pLMNIdList; + @Column(name = "MAXNOOFUES") + private Integer maxNumberofUEs; + @Column(name = "LATENCY") + private Integer latency; + @Column(name = "DLTHPTPERSLICE") + private Integer dLThptPerSlice; + @Column(name = "ULTHPTPERSLICE") + private Integer uLThptPerSlice; + @Column(name = "MAXNUMBEROFCONNS") + private Integer maxNumberofConns; + + public Integer getdLThptPerSlice() { + return dLThptPerSlice; + } + + public void setdLThptPerSlice(Integer dLThptPerSlice) { + this.dLThptPerSlice = dLThptPerSlice; + } + + public Integer getuLThptPerSlice() { + return uLThptPerSlice; + } + + public void setuLThptPerSlice(Integer uLThptPerSlice) { + this.uLThptPerSlice = uLThptPerSlice; + } + + public Integer getMaxNumberofConns() { + return maxNumberofConns; + } + + public void setMaxNumberofConns(Integer maxNumberofConns) { + this.maxNumberofConns = maxNumberofConns; + } + + public String getCoverageAreaList() { + return coverageAreaList; + } + + /* + * @Column(name="EXPDATARATEDL") private Integer expDataRateDL; + * + * @Column(name="EXPDATARATEUL") private Integer expDataRateUL; + * + * @Column(name="MAXNUMBEROFPDUSESSIONS") private Integer + * maxNumberofPDUSessions; + */ + @Column(name = "UEMOBILITYLEVEL") + private String uEMobilityLevel; + @Column(name = "RESOURCESHARINGLEVEL") + private String resourceSharingLevel; + // @ElementCollection + // @CollectionTable(name="coveragearealist", joinColumns = + // @JoinColumn(name="sliceprofileid")) + @Column(name = "coveragearealist") + private String coverageAreaList; + @ManyToOne + @JoinColumn(name = "rannfnssiid") + private RANSliceInfo rANSliceInventory; + + public String getSliceProfileId() { + return sliceProfileId; + } + + public void setSliceProfileId(String sliceProfileId) { + this.sliceProfileId = sliceProfileId; + } + + public String getsNSSAI() { + return sNSSAI; + } + + public void setsNSSAI(String sNSSAI) { + this.sNSSAI = sNSSAI; + } + + public String getpLMNIdList() { + return pLMNIdList; + } + + public void setpLMNIdList(String pLMNIdList) { + this.pLMNIdList = pLMNIdList; + } + + public Integer getMaxNumberofUEs() { + return maxNumberofUEs; + } + + public void setMaxNumberofUEs(Integer maxNumberofUEs) { + this.maxNumberofUEs = maxNumberofUEs; + } + + public Integer getLatency() { + return latency; + } + + public void setLatency(Integer latency) { + this.latency = latency; + } + + public String getuEMobilityLevel() { + return uEMobilityLevel; + } + + public void setuEMobilityLevel(String uEMobilityLevel) { + this.uEMobilityLevel = uEMobilityLevel; + } + + public String getResourceSharingLevel() { + return resourceSharingLevel; + } + + public void setResourceSharingLevel(String resourceSharingLevel) { + this.resourceSharingLevel = resourceSharingLevel; + } + + public RANSliceInfo getrANSliceInventory() { + return rANSliceInventory; + } + + public void setrANSliceInventory(RANSliceInfo rANSliceInventory) { + this.rANSliceInventory = rANSliceInventory; + } + + public void setCoverageAreaList(String coverageAreaList) { + this.coverageAreaList = coverageAreaList; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/TACells.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/TACells.java index 37ff491..40ab024 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/TACells.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/TACells.java @@ -30,31 +30,31 @@ import javax.persistence.Table; @Entity @Table(name = "TACELLS") public class TACells implements Serializable { - private static final long serialVersionUID = 1L; - @Id - @Column(name = "TRACKINGAREA") - private String trackingArea; - @Column(name = "CELLS") - private String cellsList; - - public String getTrackingArea() { - return trackingArea; - } - - public void setTrackingArea(String trackingArea) { - this.trackingArea = trackingArea; - } - - public String getCellsList() { - return cellsList; - } - - public void setCellsList(String cellsList) { - this.cellsList = cellsList; - } - - @Override - public String toString() { - return "TACells [trackingArea=" + trackingArea + ", cellsList=" + cellsList + "]"; - } + private static final long serialVersionUID = 1L; + @Id + @Column(name = "TRACKINGAREA") + private String trackingArea; + @Column(name = "CELLS") + private String cellsList; + + public String getTrackingArea() { + return trackingArea; + } + + public void setTrackingArea(String trackingArea) { + this.trackingArea = trackingArea; + } + + public String getCellsList() { + return cellsList; + } + + public void setCellsList(String cellsList) { + this.cellsList = cellsList; + } + + @Override + public String toString() { + return "TACells [trackingArea=" + trackingArea + ", cellsList=" + cellsList + "]"; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/Topology.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/Topology.java index faf7c54..3547eac 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/Topology.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/Topology.java @@ -23,84 +23,84 @@ package org.onap.ransim.rest.api.models; import java.util.List; public class Topology { - int gridSize; - float minScreenX = 0; - float minScreenY = 0; - float maxScreenX = 10; - float maxScreenY = 10; - List<CellDetails> cellTopology; - - /** - * A constructor for Topology. - * - * @param gridSize grid size - * @param minScreenX min value of screen X for a cell in the topology - * @param minScreenY min value of screen Y for a cell in the topology - * @param maxScreenX max value of screen X for a cell in the topology - * @param maxScreenY max value of screen Y for a cell in the topology - * @param cellTopology list of cells within the topology - */ - public Topology(int gridSize, float minScreenX, float minScreenY, float maxScreenX, float maxScreenY, - List<CellDetails> cellTopology) { - super(); - this.gridSize = gridSize; - this.minScreenX = minScreenX; - this.minScreenY = minScreenY; - this.maxScreenX = maxScreenX; - this.maxScreenY = maxScreenY; - this.cellTopology = cellTopology; - } - - public Topology() { - - } - - public int getGridSize() { - return gridSize; - } - - public void setGridSize(int gridSize) { - this.gridSize = gridSize; - } - - public float getMinScreenX() { - return minScreenX; - } - - public void setMinScreenX(float minScreenX) { - this.minScreenX = minScreenX; - } - - public float getMinScreenY() { - return minScreenY; - } - - public void setMinScreenY(float minScreenY) { - this.minScreenY = minScreenY; - } - - public float getMaxScreenX() { - return maxScreenX; - } - - public void setMaxScreenX(float maxScreenX) { - this.maxScreenX = maxScreenX; - } - - public float getMaxScreenY() { - return maxScreenY; - } - - public void setMaxScreenY(float maxScreenY) { - this.maxScreenY = maxScreenY; - } - - public List<CellDetails> getCellTopology() { - return cellTopology; - } - - public void setCellTopology(List<CellDetails> cellTopology) { - this.cellTopology = cellTopology; - } + int gridSize; + float minScreenX = 0; + float minScreenY = 0; + float maxScreenX = 10; + float maxScreenY = 10; + List<CellDetails> cellTopology; + + /** + * A constructor for Topology. + * + * @param gridSize grid size + * @param minScreenX min value of screen X for a cell in the topology + * @param minScreenY min value of screen Y for a cell in the topology + * @param maxScreenX max value of screen X for a cell in the topology + * @param maxScreenY max value of screen Y for a cell in the topology + * @param cellTopology list of cells within the topology + */ + public Topology(int gridSize, float minScreenX, float minScreenY, float maxScreenX, float maxScreenY, + List<CellDetails> cellTopology) { + super(); + this.gridSize = gridSize; + this.minScreenX = minScreenX; + this.minScreenY = minScreenY; + this.maxScreenX = maxScreenX; + this.maxScreenY = maxScreenY; + this.cellTopology = cellTopology; + } + + public Topology() { + + } + + public int getGridSize() { + return gridSize; + } + + public void setGridSize(int gridSize) { + this.gridSize = gridSize; + } + + public float getMinScreenX() { + return minScreenX; + } + + public void setMinScreenX(float minScreenX) { + this.minScreenX = minScreenX; + } + + public float getMinScreenY() { + return minScreenY; + } + + public void setMinScreenY(float minScreenY) { + this.minScreenY = minScreenY; + } + + public float getMaxScreenX() { + return maxScreenX; + } + + public void setMaxScreenX(float maxScreenX) { + this.maxScreenX = maxScreenX; + } + + public float getMaxScreenY() { + return maxScreenY; + } + + public void setMaxScreenY(float maxScreenY) { + this.maxScreenY = maxScreenY; + } + + public List<CellDetails> getCellTopology() { + return cellTopology; + } + + public void setCellTopology(List<CellDetails> cellTopology) { + this.cellTopology = cellTopology; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/TopologyDump.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/TopologyDump.java index b2aefec..54e6bcf 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/TopologyDump.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/TopologyDump.java @@ -24,28 +24,28 @@ import java.util.List; public class TopologyDump { - private List<CellData> cellList; + private List<CellData> cellList; - /** - * A constructor for TopologyDump. - * - * @param cellList list of cells - */ - public TopologyDump(List<CellData> cellList) { + /** + * A constructor for TopologyDump. + * + * @param cellList list of cells + */ + public TopologyDump(List<CellData> cellList) { - this.cellList = cellList; - } + this.cellList = cellList; + } - public TopologyDump() { + public TopologyDump() { - } + } - public List<CellData> getCellList() { - return cellList; - } + public List<CellData> getCellList() { + return cellList; + } - public void setCellList(List<CellData> cellList) { - this.cellList = cellList; - } + public void setCellList(List<CellData> cellList) { + this.cellList = cellList; + } } |