diff options
Diffstat (limited to 'ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket')
5 files changed, 83 insertions, 125 deletions
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/AttributesNRRelation.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/AttributesNRRelation.java index 791c78d..3118a32 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/AttributesNRRelation.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/AttributesNRRelation.java @@ -29,6 +29,7 @@ private Integer nRTCI; private boolean isHOAllowed; + @JsonProperty("nRTCI") public Integer getNRTCI() { return nRTCI; } @@ -37,6 +38,7 @@ this.nRTCI = nRTCI; } + @JsonProperty("isHOAllowed") public boolean getIsHOAllowed() { return isHOAllowed; } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/DUAttributes.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/DUAttributes.java new file mode 100755 index 0000000..68a7f4a --- /dev/null +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/DUAttributes.java @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2021 Wipro Limited. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.onap.ransim.websocket.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + +@JsonInclude(JsonInclude.Include.NON_NULL) +public class DUAttributes { + + private int nRPCI; + private String operationalState; + private String cellState; + + @JsonProperty("nRPCI") + public int getNRPCI() { + return nRPCI; + } + + public void setNRPCI(int nRPCI) { + this.nRPCI = nRPCI; + } + + public String getOperationalState() { + return operationalState; + } + + public void setOperationalState(String operationalState) { + this.operationalState = operationalState; + } + + public String getCellState() { + return cellState; + } + + public void setCellState(String cellState) { + this.cellState = cellState; + } + + public DUAttributes() { + + } + + public DUAttributes(int nRPCI) { + super(); + this.nRPCI = nRPCI; + } + + @Override + public String toString() { + return "Attributes [ nRPCI=" + nRPCI + "]"; + } +} 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 cb5f330..e1f1923 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,17 +24,9 @@ import java.util.List; public class ModifyNeighbor { - private String idGNBCUCPFunction; private String idNRCellCU; - private List<NeighborHo> neighborList; - - public String getIdGNBCUCPFunction() { - return idGNBCUCPFunction; - } - - public void setIdGNBCUCPFunction(String idGNBCUCPFunction) { - this.idGNBCUCPFunction = idGNBCUCPFunction; - } + private String idNRCellRelation; + private AttributesNRRelation attributes; public String getIdNRCellCU() { return idNRCellCU; @@ -44,12 +36,16 @@ public class ModifyNeighbor { this.idNRCellCU = idNRCellCU; } - public List<NeighborHo> getNeighborList() { - return neighborList; + public String getIdNRCellRelation(){ return idNRCellRelation; } + + public void setIdNRCellRelation(String idNRCellRelation){ this.idNRCellRelation = idNRCellRelation; } + + public AttributesNRRelation getAttributes() { + return attributes; } - public void setNeighborList(List<NeighborHo> neighborList) { - this.neighborList = neighborList; + public void setAttributes(AttributesNRRelation attributes) { + this.attributes = attributes; } } 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 deleted file mode 100644 index 7ef8707..0000000 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ModifyPci.java +++ /dev/null @@ -1,107 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * Ran Simulator Controller - * ================================================================================ - * Copyright (C) 2020 Wipro Limited. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.ransim.websocket.model; - -import java.util.List; - -public class ModifyPci { - - private String idGNBDUFunction; - - private long nRPCI; - - private String idNRCellDU; - - private List<Neighbor> neighborList; - - public long getNRPCI() { - return nRPCI; - } - - public void setNRPCI(long nRPCI) { - this.nRPCI = nRPCI; - } - - public String getIdNRCellDU() { - return idNRCellDU; - } - - public void setIdNRCellDU(String idNRCellDU) { - this.idNRCellDU = idNRCellDU; - } - - @Override - public String toString() { - return "ModifyPci [idGNBDUFunction = " + idGNBDUFunction + ", nRPCI = " + nRPCI + ", idNRCellDU = " + idNRCellDU + "neighborList:" - + neighborList + "]"; - } - - public ModifyPci() { - } - - /** - * Modify Pci value from sdnr. - * - * @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 idGNBDUFunction, long nRPCI, String idNRCellDU, List<Neighbor> neighborList) { - super(); - this.idGNBDUFunction = idGNBDUFunction; - this.nRPCI = nRPCI; - this.idNRCellDU = idNRCellDU; - this.neighborList = neighborList; - } - - public String getIdGNBDUFunction() { - return idGNBDUFunction; - } - - public void setIdGNBDUFunction(String idGNBDUFunction) { - this.idGNBDUFunction = idGNBDUFunction; - } - - public List<Neighbor> getNeighborList() { - return neighborList; - } - - public void setNeighborList(List<Neighbor> neighborList) { - this.neighborList = neighborList; - } - - /** - * Checks if all the parameters are set correctly . - * - * @return returns true if the parameter are set correctly - */ - public boolean isAllSet() { - if (idGNBDUFunction == null || idGNBDUFunction.trim().equals("")) { - return false; - } - 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/NRCellDU.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NRCellDU.java index bc6003f..2e46cd9 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NRCellDU.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NRCellDU.java @@ -27,7 +27,7 @@ public class NRCellDU { private String idNRCellDU; - private Attributes attributes; + private DUAttributes attributes; public String getIdNRCellDU() { return idNRCellDU; @@ -37,15 +37,15 @@ public class NRCellDU { this.idNRCellDU = idNRCellDU; } - public Attributes getAttributes() { + public DUAttributes getAttributes() { return attributes; } - public void setAttributes(Attributes attributes) { + public void setAttributes(DUAttributes attributes) { this.attributes = attributes; } - public NRCellDU(Attributes attributes) { + public NRCellDU(DUAttributes attributes) { super(); this.attributes = attributes; } |