aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INFO.yaml26
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/services/RansimControllerServices.java46
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ModifyNeighbor.java20
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ModifyPci.java50
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/Neighbor.java44
-rw-r--r--ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NeighborHo.java30
6 files changed, 111 insertions, 105 deletions
diff --git a/INFO.yaml b/INFO.yaml
index 10ba5e9..bb1d319 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -31,21 +31,11 @@ repositories:
- 'integration/simulators/ran-simulator'
committers:
- <<: *onap_integration_ptl
- - name: 'Christophe Closset'
- email: 'cc697w@intl.att.com'
- company: 'ATT'
- id: 'ChrisC'
- timezone: 'Belgium/Namur'
- name: 'Catherine Lefevre'
email: 'cl664y@att.com'
company: 'AT&T'
id: 'Katel34'
timezone: 'Europe/Belgium'
- - name: 'Brian Freeman'
- email: 'bf1936@att.com'
- company: 'AT&T'
- id: 'bdfreeman1421'
- timezone: 'America/New_York'
- name: 'Morgan Richomme'
email: 'morgan.richomme@orange.com'
company: 'orange'
@@ -90,6 +80,16 @@ committers:
company: 'Samsung'
id: 'aalexanderr'
timezone: 'Europe/Warsaw'
+ - name: 'Maciej Lisowski'
+ email: 'm.lisowski2@partner.samsung.com'
+ company: 'Samsung'
+ id: 'mlisowski'
+ timezone: 'Europe/Warsaw'
+ - name: 'Marcin Sebastian Krasowski'
+ email: 'm.krasowski@samsung.com'
+ company: 'Samsung'
+ id: 'mkrasowski'
+ timezone: 'Europe/Warsaw'
tsc:
# yamllint disable rule:line-length
approval: 'https://lists.onap.org/pipermail/onap-tsc'
@@ -139,3 +139,9 @@ tsc:
- type: 'Deletion'
name: 'Bartosz Gardziejewski'
link: 'https://lists.onap.org/g/onap-tsc/message/8286'
+ - type: 'Deletion'
+ name: 'Christophe Closset, Brian Freeman'
+ link: 'https://lists.onap.org/g/onap-tsc/message/8449'
+ - type: 'Addition'
+ name: 'Maciej Lisowski, Marcin Sebastian Krasowski'
+ link: 'https://lists.onap.org/g/onap-tsc/message/8449'
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/services/RansimControllerServices.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/services/RansimControllerServices.java
index 924f9b1..3e1e2a9 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/services/RansimControllerServices.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/services/RansimControllerServices.java
@@ -1221,12 +1221,12 @@ public class RansimControllerServices {
for (NeighborDetails cellDetails : nbrsDet) {
Neighbor nbr = new Neighbor();
CellDetails nbrCell = ransimRepo.getCellDetail(cellDetails.getNeigbor().getNeighborCell());
- nbr.setNodeId(nbrCell.getNodeId());
- nbr.setPhysicalCellId(nbrCell.getPhysicalCellId());
- nbr.setPnfName(nbrCell.getServerId());
+ nbr.setIdNRCellRelation(nbrCell.getNodeId());
+ nbr.setNRTCI(nbrCell.getPhysicalCellId());
+ nbr.setIdGNBCUCPFunction(nbrCell.getServerId());
nbr.setServerId(nbrCell.getServerId());
nbr.setPlmnId(nbrCell.getNetworkId());
- nbr.setBlacklisted(cellDetails.isBlacklisted());
+ nbr.setIsHOAllowed(cellDetails.isBlacklisted());
nbrList.add(nbr);
}
cell.setNeighborList(nbrList);
@@ -1273,13 +1273,13 @@ public class RansimControllerServices {
public void handleModifyPciFromSdnr(String message, Session session, String ipPort) {
log.info("handleModifyPciFromSDNR: message:" + message + " session:" + session + " ipPort:" + ipPort);
ModifyPci modifyPci = new Gson().fromJson(message, ModifyPci.class);
- log.info("handleModifyPciFromSDNR: modifyPci:" + modifyPci.getCellId() + "; pci: " + modifyPci.getPciId());
+ log.info("handleModifyPciFromSDNR: modifyPci:" + modifyPci.getIdNRCellDU() + "; pci: " + modifyPci.getNRPCI());
String source = "Netconf";
- CellDetails cd = ransimRepo.getCellDetail(modifyPci.getCellId());
+ CellDetails cd = ransimRepo.getCellDetail(modifyPci.getIdNRCellDU());
long pci = cd.getPhysicalCellId();
- cd.setPhysicalCellId(modifyPci.getPciId());
+ cd.setPhysicalCellId(modifyPci.getNRPCI());
ransimRepo.mergeCellDetails(cd);
- rsPciHdlr.updatePciOperationsTable(modifyPci.getCellId(), source, pci, modifyPci.getPciId());
+ rsPciHdlr.updatePciOperationsTable(modifyPci.getIdNRCellDU(), source, pci, modifyPci.getNRPCI());
}
public void handleRTRICConfigFromSdnr(String message, Session session, String ipPort) {
@@ -1558,36 +1558,36 @@ public class RansimControllerServices {
public void handleModifyNeighborFromSdnr(String message, Session session, String ipPort) {
log.info("handleModifyAnrFromSDNR: message:" + message + " session:" + session + " ipPort:" + ipPort);
ModifyNeighbor modifyNeighbor = new Gson().fromJson(message, ModifyNeighbor.class);
- log.info("handleModifyAnrFromSDNR: modifyPci:" + modifyNeighbor.getCellId());
+ log.info("handleModifyAnrFromSDNR: modifyPci:" + modifyNeighbor.getIdNRCellCU());
List<NeighborDetails> neighborList = new ArrayList<NeighborDetails>();
List<String> cellList = new ArrayList<String>();
- cellList.add(modifyNeighbor.getCellId());
+ cellList.add(modifyNeighbor.getIdNRCellCU());
String nbrsAdd = "";
String nbrsDel = "";
String source = "Netconf";
for (int i = 0; i < modifyNeighbor.getNeighborList().size(); i++) {
- if (modifyNeighbor.getNeighborList().get(i).isBlacklisted()) {
+ if (!modifyNeighbor.getNeighborList().get(i).getIsHOAllowed()) {
NeighborDetails nd = new NeighborDetails(
- new NeihborId(modifyNeighbor.getCellId(), modifyNeighbor.getNeighborList().get(i).getNodeId()),
+ new NeihborId(modifyNeighbor.getIdNRCellCU(), modifyNeighbor.getNeighborList().get(i).getIdNRCellRelation()),
true);
ransimRepo.mergeNeighborDetails(nd);
- cellList.add(modifyNeighbor.getNeighborList().get(i).getNodeId());
+ cellList.add(modifyNeighbor.getNeighborList().get(i).getIdNRCellRelation());
if (nbrsAdd.equals("")) {
- nbrsDel = modifyNeighbor.getNeighborList().get(i).getNodeId();
+ nbrsDel = modifyNeighbor.getNeighborList().get(i).getIdNRCellRelation();
} else {
- nbrsDel += "," + modifyNeighbor.getNeighborList().get(i).getNodeId();
+ nbrsDel += "," + modifyNeighbor.getNeighborList().get(i).getIdNRCellRelation();
}
} else {
NeighborDetails nd = new NeighborDetails(
- new NeihborId(modifyNeighbor.getCellId(), modifyNeighbor.getNeighborList().get(i).getNodeId()),
+ new NeihborId(modifyNeighbor.getIdNRCellCU(), modifyNeighbor.getNeighborList().get(i).getIdNRCellRelation()),
false);
ransimRepo.mergeNeighborDetails(nd);
- cellList.add(modifyNeighbor.getNeighborList().get(i).getNodeId());
+ cellList.add(modifyNeighbor.getNeighborList().get(i).getIdNRCellRelation());
if (nbrsDel.equals("")) {
- nbrsAdd = modifyNeighbor.getNeighborList().get(i).getNodeId();
+ nbrsAdd = modifyNeighbor.getNeighborList().get(i).getIdNRCellRelation();
} else {
- nbrsAdd += "," + modifyNeighbor.getNeighborList().get(i).getNodeId();
+ nbrsAdd += "," + modifyNeighbor.getNeighborList().get(i).getIdNRCellRelation();
}
}
@@ -1599,7 +1599,7 @@ public class RansimControllerServices {
log.info("neighbor list: " + neighborList);
- rsPciHdlr.updateNbrsOperationsTable(modifyNeighbor.getCellId(), source, nbrsAdd, nbrsDel);
+ rsPciHdlr.updateNbrsOperationsTable(modifyNeighbor.getIdNRCellCU(), source, nbrsAdd, nbrsDel);
}
/**
@@ -1621,9 +1621,9 @@ public class RansimControllerServices {
Neighbor nbr = new Neighbor();
CellDetails nbrCell = ransimRepo.getCellDetail(nbCell.getNeigbor().getNeighborCell());
- nbr.setNodeId(nbrCell.getNodeId());
- nbr.setPhysicalCellId(nbrCell.getPhysicalCellId());
- nbr.setPnfName(nbrCell.getNodeName());
+ nbr.setIdNRCellRelation(nbrCell.getNodeId());
+ nbr.setNRTCI(nbrCell.getPhysicalCellId());
+ nbr.setIdGNBCUCPFunction(nbrCell.getNodeName());
nbr.setServerId(nbrCell.getServerId());
nbr.setPlmnId(nbrCell.getNetworkId());
nbrList.add(nbr);
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ModifyNeighbor.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ModifyNeighbor.java
index a85d846..cb5f330 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ModifyNeighbor.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ModifyNeighbor.java
@@ -24,24 +24,24 @@ import java.util.List;
public class ModifyNeighbor {
- private String pnfName;
- private String cellId;
+ private String idGNBCUCPFunction;
+ private String idNRCellCU;
private List<NeighborHo> neighborList;
- public String getPnfName() {
- return pnfName;
+ public String getIdGNBCUCPFunction() {
+ return idGNBCUCPFunction;
}
- public void setPnfName(String pnfName) {
- this.pnfName = pnfName;
+ public void setIdGNBCUCPFunction(String idGNBCUCPFunction) {
+ this.idGNBCUCPFunction = idGNBCUCPFunction;
}
- public String getCellId() {
- return cellId;
+ public String getIdNRCellCU() {
+ return idNRCellCU;
}
- public void setCellId(String cellId) {
- this.cellId = cellId;
+ public void setIdNRCellCU(String idNRCellCU) {
+ this.idNRCellCU = idNRCellCU;
}
public List<NeighborHo> getNeighborList() {
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ModifyPci.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ModifyPci.java
index 7687f22..7ef8707 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ModifyPci.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ModifyPci.java
@@ -24,33 +24,33 @@ import java.util.List;
public class ModifyPci {
- private String pnfName;
+ private String idGNBDUFunction;
- private long pciId;
+ private long nRPCI;
- private String cellId;
+ private String idNRCellDU;
private List<Neighbor> neighborList;
- public long getPciId() {
- return pciId;
+ public long getNRPCI() {
+ return nRPCI;
}
- public void setPciId(long pciId) {
- this.pciId = pciId;
+ public void setNRPCI(long nRPCI) {
+ this.nRPCI = nRPCI;
}
- public String getCellId() {
- return cellId;
+ public String getIdNRCellDU() {
+ return idNRCellDU;
}
- public void setCellId(String cellId) {
- this.cellId = cellId;
+ public void setIdNRCellDU(String idNRCellDU) {
+ this.idNRCellDU = idNRCellDU;
}
@Override
public String toString() {
- return "ModifyPci [PnfName = " + pnfName + ", PciId = " + pciId + ", cellId = " + cellId + "neighborList:"
+ return "ModifyPci [idGNBDUFunction = " + idGNBDUFunction + ", nRPCI = " + nRPCI + ", idNRCellDU = " + idNRCellDU + "neighborList:"
+ neighborList + "]";
}
@@ -60,25 +60,25 @@ public class ModifyPci {
/**
* Modify Pci value from sdnr.
*
- * @param pnfName server id name
- * @param pciId pci number
- * @param cellId node id for the cell
+ * @param idGNBDUFunction server id name
+ * @param nRPCI pci number
+ * @param idNRCellDU node id for the cell
* @param neighborList neighbor list for the cell
*/
- public ModifyPci(String pnfName, long pciId, String cellId, List<Neighbor> neighborList) {
+ public ModifyPci(String idGNBDUFunction, long nRPCI, String idNRCellDU, List<Neighbor> neighborList) {
super();
- this.pnfName = pnfName;
- this.pciId = pciId;
- this.cellId = cellId;
+ this.idGNBDUFunction = idGNBDUFunction;
+ this.nRPCI = nRPCI;
+ this.idNRCellDU = idNRCellDU;
this.neighborList = neighborList;
}
- public String getPnfName() {
- return pnfName;
+ public String getIdGNBDUFunction() {
+ return idGNBDUFunction;
}
- public void setPnfName(String pnfName) {
- this.pnfName = pnfName;
+ public void setIdGNBDUFunction(String idGNBDUFunction) {
+ this.idGNBDUFunction = idGNBDUFunction;
}
public List<Neighbor> getNeighborList() {
@@ -95,10 +95,10 @@ public class ModifyPci {
* @return returns true if the parameter are set correctly
*/
public boolean isAllSet() {
- if (pnfName == null || pnfName.trim().equals("")) {
+ if (idGNBDUFunction == null || idGNBDUFunction.trim().equals("")) {
return false;
}
- if (cellId == null || cellId.trim().equals("")) {
+ if (idNRCellDU == null || idNRCellDU.trim().equals("")) {
return false;
}
return true;
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/Neighbor.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/Neighbor.java
index e64caf0..add0633 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/Neighbor.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/Neighbor.java
@@ -23,11 +23,11 @@ package org.onap.ransim.websocket.model;
public class Neighbor {
private String plmnId;
- private String nodeId;
- private long physicalCellId;
+ private String idNRCellRelation;
+ private long nRTCI;
private String serverId;
- private String pnfName;
- private boolean blacklisted;
+ private String idGNBCUCPFunction;
+ private boolean isHOAllowed;
public String getPlmnId() {
return plmnId;
@@ -37,20 +37,20 @@ public class Neighbor {
this.plmnId = plmnId;
}
- public String getNodeId() {
- return nodeId;
+ public String getIdNRCellRelation() {
+ return idNRCellRelation;
}
- public void setNodeId(String nodeId) {
- this.nodeId = nodeId;
+ public void setIdNRCellRelation(String idNRCellRelation) {
+ this.idNRCellRelation = idNRCellRelation;
}
- public long getPhysicalCellId() {
- return physicalCellId;
+ public long getNRTCI() {
+ return nRTCI;
}
- public void setPhysicalCellId(long physicalCellId) {
- this.physicalCellId = physicalCellId;
+ public void setNRTCI(long nRTCI) {
+ this.nRTCI = nRTCI;
}
public String getServerId() {
@@ -61,29 +61,29 @@ public class Neighbor {
this.serverId = serverId;
}
- public String getPnfName() {
- return pnfName;
+ public String getIdGNBCUCPFunction() {
+ return idGNBCUCPFunction;
}
- public void setPnfName(String pnfName) {
- this.pnfName = pnfName;
+ public void setIdGNBCUCPFunction(String idGNBCUCPFunction) {
+ this.idGNBCUCPFunction = idGNBCUCPFunction;
}
public Neighbor() {
// TODO Auto-generated constructor stub
}
- public boolean isBlacklisted() {
- return blacklisted;
+ public boolean getIsHOAllowed() {
+ return isHOAllowed;
}
- public void setBlacklisted(boolean blacklisted) {
- this.blacklisted = blacklisted;
+ public void setIsHOAllowed(boolean blacklisted) {
+ this.isHOAllowed = isHOAllowed;
}
@Override
public String toString() {
- return "Neighbor [nodeId=" + nodeId + ", physicalCellId=" + physicalCellId + ", serverId=" + serverId
- + ", pnfName=" + pnfName + "]";
+ return "Neighbor [idNRCellRelation=" + idNRCellRelation + ", nRTCI=" + nRTCI + ", serverId=" + serverId
+ + ", idGNBCUCPFunction=" + idGNBCUCPFunction + "]";
}
}
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NeighborHo.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NeighborHo.java
index 8d8abd7..cf9c72f 100644
--- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NeighborHo.java
+++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NeighborHo.java
@@ -22,32 +22,32 @@ package org.onap.ransim.websocket.model;
public class NeighborHo {
- private String nodeId;
- private long pciId;
- private boolean blacklisted;
+ private String idNRCellRelation;
+ private long nRTCI;
+ private boolean isHOAllowed;
- public String getNodeId() {
- return nodeId;
+ public String getIdNRCellRelation() {
+ return idNRCellRelation;
}
- public void setNodeId(String nodeId) {
- this.nodeId = nodeId;
+ public void setIdNRCellRelation(String idNRCellRelation) {
+ this.idNRCellRelation = idNRCellRelation;
}
- public long getPciId() {
- return pciId;
+ public long getNRTCI() {
+ return nRTCI;
}
- public void setPciId(long pciId) {
- this.pciId = pciId;
+ public void setNRTCI(long nRTCI) {
+ this.nRTCI = nRTCI;
}
- public boolean isBlacklisted() {
- return blacklisted;
+ public boolean getIsHOAllowed() {
+ return isHOAllowed;
}
- public void setBlacklisted(boolean blacklisted) {
- this.blacklisted = blacklisted;
+ public void setIsHOAllowed(boolean isHOAllowed) {
+ this.isHOAllowed = isHOAllowed;
}
}