diff options
Diffstat (limited to 'ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket')
31 files changed, 1293 insertions, 1259 deletions
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/AdditionalMeasurements.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/AdditionalMeasurements.java index a822385..ba6c453 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/AdditionalMeasurements.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/AdditionalMeasurements.java @@ -25,23 +25,23 @@ import java.util.Map; public class AdditionalMeasurements { - private String name; - private Map<String, String> hashMap = new HashMap<String, String>(); + private String name; + private Map<String, String> hashMap = new HashMap<String, String>(); - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } - public Map<String, String> getHashMap() { - return hashMap; - } + public Map<String, String> getHashMap() { + return hashMap; + } - public void setHashMap(Map<String, String> hashMap) { - this.hashMap = hashMap; - } + public void setHashMap(Map<String, String> hashMap) { + this.hashMap = hashMap; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/Attributes.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/Attributes.java index f875f10..686ba37 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/Attributes.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/Attributes.java @@ -20,47 +20,55 @@ package org.onap.ransim.websocket.model; -import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonInclude(JsonInclude.Include.NON_NULL) public class Attributes { private String locationName; - private String gNBId; + private String gNBId; private String operationalState; private String cellState; private String gNBCUUPId; - + public String getLocationName() { - return locationName; + return locationName; } + public void setLocationName(String locationName) { - this.locationName = locationName; + this.locationName = locationName; } + public String getgNBId() { - return gNBId; + return gNBId; } + public void setgNBId(String gNBId) { - this.gNBId = gNBId; + this.gNBId = gNBId; } + public String getOperationalState() { - return operationalState; + return operationalState; } + public void setOperationalState(String operationalState) { - this.operationalState = operationalState; + this.operationalState = operationalState; } + public String getCellState() { - return cellState; + return cellState; } + public void setCellState(String cellState) { - this.cellState = cellState; - } + this.cellState = cellState; + } + public String getgNBCUUPId() { - return gNBCUUPId; + return gNBCUUPId; } + public void setgNBCUUPId(String gNBCUUPId) { - this.gNBCUUPId = gNBCUUPId; - } + this.gNBCUUPId = gNBCUUPId; + } } - diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/CommonEventHeaderFm.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/CommonEventHeaderFm.java index c6bf224..c0afa18 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/CommonEventHeaderFm.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/CommonEventHeaderFm.java @@ -22,65 +22,65 @@ package org.onap.ransim.websocket.model; public class CommonEventHeaderFm { - private String sourceName; - private String sourceUuid; - private String reportingEntityName; - private long startEpochMicrosec; - private long lastEpochMicrosec; - - public CommonEventHeaderFm() { - super(); - // TODO Auto-generated constructor stub - } - - public CommonEventHeaderFm(String sourceName, String sourceUuid, String reportingEntityName, - long startEpochMicrosec, long lastEpochMicrosec) { - super(); - this.sourceName = sourceName; - this.sourceUuid = sourceUuid; - this.reportingEntityName = reportingEntityName; - this.startEpochMicrosec = startEpochMicrosec; - this.lastEpochMicrosec = lastEpochMicrosec; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getSourceUuid() { - return sourceUuid; - } - - public void setSourceUuid(String sourceUuid) { - this.sourceUuid = sourceUuid; - } - - public long getStartEpochMicrosec() { - return startEpochMicrosec; - } - - public void setStartEpochMicrosec(long startEpochMicrosec) { - this.startEpochMicrosec = startEpochMicrosec; - } - - public long getLastEpochMicrosec() { - return lastEpochMicrosec; - } - - public void setLastEpochMicrosec(long lastEpochMicrosec) { - this.lastEpochMicrosec = lastEpochMicrosec; - } - - public String getReportingEntityName() { - return reportingEntityName; - } - - public void setReportingEntityName(String reportingEntityName) { - this.reportingEntityName = reportingEntityName; - } + private String sourceName; + private String sourceUuid; + private String reportingEntityName; + private long startEpochMicrosec; + private long lastEpochMicrosec; + + public CommonEventHeaderFm() { + super(); + // TODO Auto-generated constructor stub + } + + public CommonEventHeaderFm(String sourceName, String sourceUuid, String reportingEntityName, + long startEpochMicrosec, long lastEpochMicrosec) { + super(); + this.sourceName = sourceName; + this.sourceUuid = sourceUuid; + this.reportingEntityName = reportingEntityName; + this.startEpochMicrosec = startEpochMicrosec; + this.lastEpochMicrosec = lastEpochMicrosec; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getSourceUuid() { + return sourceUuid; + } + + public void setSourceUuid(String sourceUuid) { + this.sourceUuid = sourceUuid; + } + + public long getStartEpochMicrosec() { + return startEpochMicrosec; + } + + public void setStartEpochMicrosec(long startEpochMicrosec) { + this.startEpochMicrosec = startEpochMicrosec; + } + + public long getLastEpochMicrosec() { + return lastEpochMicrosec; + } + + public void setLastEpochMicrosec(long lastEpochMicrosec) { + this.lastEpochMicrosec = lastEpochMicrosec; + } + + public String getReportingEntityName() { + return reportingEntityName; + } + + public void setReportingEntityName(String reportingEntityName) { + this.reportingEntityName = reportingEntityName; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/CommonEventHeaderPm.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/CommonEventHeaderPm.java index dc87d50..e31a62c 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/CommonEventHeaderPm.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/CommonEventHeaderPm.java @@ -22,41 +22,41 @@ package org.onap.ransim.websocket.model; public class CommonEventHeaderPm { - private String sourceName; - private String sourceUuid; - private long startEpochMicrosec; - private long lastEpochMicrosec; - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getSourceUuid() { - return sourceUuid; - } - - public void setSourceUuid(String sourceUuid) { - this.sourceUuid = sourceUuid; - } - - public long getStartEpochMicrosec() { - return startEpochMicrosec; - } - - public void setStartEpochMicrosec(long startEpochMicrosec) { - this.startEpochMicrosec = startEpochMicrosec; - } - - public long getLastEpochMicrosec() { - return lastEpochMicrosec; - } - - public void setLastEpochMicrosec(long lastEpochMicrosec) { - this.lastEpochMicrosec = lastEpochMicrosec; - } + private String sourceName; + private String sourceUuid; + private long startEpochMicrosec; + private long lastEpochMicrosec; + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getSourceUuid() { + return sourceUuid; + } + + public void setSourceUuid(String sourceUuid) { + this.sourceUuid = sourceUuid; + } + + public long getStartEpochMicrosec() { + return startEpochMicrosec; + } + + public void setStartEpochMicrosec(long startEpochMicrosec) { + this.startEpochMicrosec = startEpochMicrosec; + } + + public long getLastEpochMicrosec() { + return lastEpochMicrosec; + } + + public void setLastEpochMicrosec(long lastEpochMicrosec) { + this.lastEpochMicrosec = lastEpochMicrosec; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ConfigData.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ConfigData.java index 859b51d..a3770d5 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ConfigData.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ConfigData.java @@ -1,53 +1,53 @@ -/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ransim.websocket.model;
-
-public class ConfigData {
-
- private String configParameter;
-
- private int configValue;
-
- public String getConfigParameter() {
- return configParameter;
- }
-
- public void setConfigParameter(String configParameter) {
- this.configParameter = configParameter;
- }
-
- public int getConfigValue() {
- return configValue;
- }
-
- public void setConfigValue(int configValue) {
- this.configValue = configValue;
- }
-
- public ConfigData() {
-
- }
-
- public ConfigData(String configParameter, int configValue) {
- this.configParameter= configParameter;
- this.configValue = configValue;
- }
-}
+/* + * ============LICENSE_START======================================================= + * Ran Simulator Controller + * ================================================================================ + * Copyright (C) 2020-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. + * ============LICENSE_END========================================================= + */ + +package org.onap.ransim.websocket.model; + +public class ConfigData { + + private String configParameter; + + private int configValue; + + public String getConfigParameter() { + return configParameter; + } + + public void setConfigParameter(String configParameter) { + this.configParameter = configParameter; + } + + public int getConfigValue() { + return configValue; + } + + public void setConfigValue(int configValue) { + this.configValue = configValue; + } + + public ConfigData() { + + } + + public ConfigData(String configParameter, int configValue) { + this.configParameter = configParameter; + this.configValue = configValue; + } +} diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ConfigPLMNInfo.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ConfigPLMNInfo.java index b857829..7f8eba2 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ConfigPLMNInfo.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/ConfigPLMNInfo.java @@ -1,58 +1,58 @@ -/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ransim.websocket.model;
-
-import java.util.*;
-
-public class ConfigPLMNInfo {
-
- private String mcc;
- private String mnc;
- private List<SNSSAI> sNSSAI;
-
- public String getMcc() {
- return mcc;
- }
-
- public void setMcc(String mcc) {
- this.mcc = mcc;
- }
-
- public String getMnc() {
- return mnc;
- }
-
- public void setMnc(String mnc) {
- this.mnc = mnc;
- }
-
- public List<SNSSAI> getSNSSAI() {
- return sNSSAI;
- }
-
- public void setSNSSAI(List<SNSSAI> sNSSAI) {
- this.sNSSAI = sNSSAI;
- }
-
- public ConfigPLMNInfo() {
-
- }
-}
+/* + * ============LICENSE_START======================================================= + * Ran Simulator Controller + * ================================================================================ + * Copyright (C) 2020-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. + * ============LICENSE_END========================================================= + */ + +package org.onap.ransim.websocket.model; + +import java.util.*; + +public class ConfigPLMNInfo { + + private String mcc; + private String mnc; + private List<SNSSAI> sNSSAI; + + public String getMcc() { + return mcc; + } + + public void setMcc(String mcc) { + this.mcc = mcc; + } + + public String getMnc() { + return mnc; + } + + public void setMnc(String mnc) { + this.mnc = mnc; + } + + public List<SNSSAI> getSNSSAI() { + return sNSSAI; + } + + public void setSNSSAI(List<SNSSAI> sNSSAI) { + this.sNSSAI = sNSSAI; + } + + public ConfigPLMNInfo() { + + } +} diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/DeviceData.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/DeviceData.java index de3c9d8..e5059b2 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/DeviceData.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/DeviceData.java @@ -24,24 +24,24 @@ import java.io.Serializable; public class DeviceData implements Serializable { - private static final long serialVersionUID = 4388248209444904611L; + private static final long serialVersionUID = 4388248209444904611L; - private String type; - private String message; + private String type; + private String message; - public void setType(String type) { - this.type = type; - } + public void setType(String type) { + this.type = type; + } - public String getType() { - return type; - } + public String getType() { + return type; + } - public void setMessage(String message) { - this.message = message; - } + public void setMessage(String message) { + this.message = message; + } - public String getMessage() { - return message; - } -}
\ No newline at end of file + public String getMessage() { + return message; + } +} diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/DeviceDataDecoder.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/DeviceDataDecoder.java index 084a01b..f1aac74 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/DeviceDataDecoder.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/DeviceDataDecoder.java @@ -26,30 +26,30 @@ import javax.websocket.EndpointConfig; public class DeviceDataDecoder implements Decoder.Text<DeviceData> { - @Override - public void destroy() { - } - - @Override - public void init(EndpointConfig arg0) { - } - - @Override - public DeviceData decode(String msgInfo) throws DecodeException { - DeviceData data = new DeviceData(); - String[] strInfo = msgInfo.split(":", 2); - if (strInfo.length < 2) { - data.setMessage(""); - } else { - data.setMessage(strInfo[1]); - } - data.setType(strInfo[0]); - return data; - } - - @Override - public boolean willDecode(String arg0) { - return true; - } + @Override + public void destroy() { + } + + @Override + public void init(EndpointConfig arg0) { + } + + @Override + public DeviceData decode(String msgInfo) throws DecodeException { + DeviceData data = new DeviceData(); + String[] strInfo = msgInfo.split(":", 2); + if (strInfo.length < 2) { + data.setMessage(""); + } else { + data.setMessage(strInfo[1]); + } + data.setType(strInfo[0]); + return data; + } + + @Override + public boolean willDecode(String arg0) { + return true; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/DeviceDataEncoder.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/DeviceDataEncoder.java index c3f1ff0..21f60fa 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/DeviceDataEncoder.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/DeviceDataEncoder.java @@ -26,22 +26,22 @@ import javax.websocket.EndpointConfig; public class DeviceDataEncoder implements Encoder.Text<DeviceData> { - @Override - public void destroy() { - // TODO Auto-generated method stub + @Override + public void destroy() { + // TODO Auto-generated method stub - } + } - @Override - public void init(EndpointConfig arg0) { - // TODO Auto-generated method stub + @Override + public void init(EndpointConfig arg0) { + // TODO Auto-generated method stub - } + } - @Override - public String encode(DeviceData msg) throws EncodeException { - String result = msg.getType() + ":" + msg.getMessage(); - return result; - } + @Override + public String encode(DeviceData msg) throws EncodeException { + String result = msg.getType() + ":" + msg.getMessage(); + return result; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/EventFm.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/EventFm.java index b89f967..e4818c7 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/EventFm.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/EventFm.java @@ -22,34 +22,34 @@ package org.onap.ransim.websocket.model; public class EventFm { - private CommonEventHeaderFm commonEventHeader; - private FaultFields faultFields; - - public EventFm(CommonEventHeaderFm commonEventHeader, FaultFields faultFields) { - super(); - this.commonEventHeader = commonEventHeader; - this.faultFields = faultFields; - } - - public EventFm() { - super(); - // TODO Auto-generated constructor stub - } - - public CommonEventHeaderFm getCommonEventHeader() { - return commonEventHeader; - } - - public void setCommonEventHeader(CommonEventHeaderFm commonEventHeader) { - this.commonEventHeader = commonEventHeader; - } - - public FaultFields getFaultFields() { - return faultFields; - } - - public void setFaultFields(FaultFields faultFields) { - this.faultFields = faultFields; - } + private CommonEventHeaderFm commonEventHeader; + private FaultFields faultFields; + + public EventFm(CommonEventHeaderFm commonEventHeader, FaultFields faultFields) { + super(); + this.commonEventHeader = commonEventHeader; + this.faultFields = faultFields; + } + + public EventFm() { + super(); + // TODO Auto-generated constructor stub + } + + public CommonEventHeaderFm getCommonEventHeader() { + return commonEventHeader; + } + + public void setCommonEventHeader(CommonEventHeaderFm commonEventHeader) { + this.commonEventHeader = commonEventHeader; + } + + public FaultFields getFaultFields() { + return faultFields; + } + + public void setFaultFields(FaultFields faultFields) { + this.faultFields = faultFields; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/EventPm.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/EventPm.java index f9e2f8b..5fcee4d 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/EventPm.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/EventPm.java @@ -22,23 +22,23 @@ package org.onap.ransim.websocket.model; public class EventPm { - private CommonEventHeaderPm commonEventHeader; - private Measurement measurement; + private CommonEventHeaderPm commonEventHeader; + private Measurement measurement; - public CommonEventHeaderPm getCommonEventHeader() { - return commonEventHeader; - } + public CommonEventHeaderPm getCommonEventHeader() { + return commonEventHeader; + } - public void setCommonEventHeader(CommonEventHeaderPm commonEventHeader) { - this.commonEventHeader = commonEventHeader; - } + public void setCommonEventHeader(CommonEventHeaderPm commonEventHeader) { + this.commonEventHeader = commonEventHeader; + } - public Measurement getMeasurement() { - return measurement; - } + public Measurement getMeasurement() { + return measurement; + } - public void setMeasurement(Measurement measurement) { - this.measurement = measurement; - } + public void setMeasurement(Measurement measurement) { + this.measurement = measurement; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/FaultFields.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/FaultFields.java index 4d9b1e8..17fed3c 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/FaultFields.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/FaultFields.java @@ -24,64 +24,64 @@ import java.util.Map; public class FaultFields { - private String alarmCondition; - private String eventSourceType; - private String specificProblem; - private String eventSeverity; - private Map<String, String> alarmAdditionalInformation; - - public FaultFields() { - super(); - } - - public FaultFields(String alarmCondition, String eventSourceType, String specificProblem, String eventSeverity, - Map<String, String> alarmAdditionalInformation) { - super(); - this.alarmCondition = alarmCondition; - this.eventSourceType = eventSourceType; - this.specificProblem = specificProblem; - this.eventSeverity = eventSeverity; - this.alarmAdditionalInformation = alarmAdditionalInformation; - } - - public String getAlarmCondition() { - return alarmCondition; - } - - public void setAlarmCondition(String alarmCondition) { - this.alarmCondition = alarmCondition; - } - - public String getEventSourceType() { - return eventSourceType; - } - - public void setEventSourceType(String eventSourceType) { - this.eventSourceType = eventSourceType; - } - - public String getSpecificProblem() { - return specificProblem; - } - - public void setSpecificProblem(String specificProblem) { - this.specificProblem = specificProblem; - } - - public String getEventSeverity() { - return eventSeverity; - } - - public void setEventSeverity(String eventSeverity) { - this.eventSeverity = eventSeverity; - } - - public Map<String, String> getAlarmAdditionalInformation() { - return alarmAdditionalInformation; - } - - public void setAlarmAdditionalInformation(Map<String, String> alarmAdditionalInformation) { - this.alarmAdditionalInformation = alarmAdditionalInformation; - } + private String alarmCondition; + private String eventSourceType; + private String specificProblem; + private String eventSeverity; + private Map<String, String> alarmAdditionalInformation; + + public FaultFields() { + super(); + } + + public FaultFields(String alarmCondition, String eventSourceType, String specificProblem, String eventSeverity, + Map<String, String> alarmAdditionalInformation) { + super(); + this.alarmCondition = alarmCondition; + this.eventSourceType = eventSourceType; + this.specificProblem = specificProblem; + this.eventSeverity = eventSeverity; + this.alarmAdditionalInformation = alarmAdditionalInformation; + } + + public String getAlarmCondition() { + return alarmCondition; + } + + public void setAlarmCondition(String alarmCondition) { + this.alarmCondition = alarmCondition; + } + + public String getEventSourceType() { + return eventSourceType; + } + + public void setEventSourceType(String eventSourceType) { + this.eventSourceType = eventSourceType; + } + + public String getSpecificProblem() { + return specificProblem; + } + + public void setSpecificProblem(String specificProblem) { + this.specificProblem = specificProblem; + } + + public String getEventSeverity() { + return eventSeverity; + } + + public void setEventSeverity(String eventSeverity) { + this.eventSeverity = eventSeverity; + } + + public Map<String, String> getAlarmAdditionalInformation() { + return alarmAdditionalInformation; + } + + public void setAlarmAdditionalInformation(Map<String, String> alarmAdditionalInformation) { + this.alarmAdditionalInformation = alarmAdditionalInformation; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/FmMessage.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/FmMessage.java index ceb5922..3c46d46 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/FmMessage.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/FmMessage.java @@ -24,14 +24,14 @@ import java.util.List; public class FmMessage { - List<EventFm> fmEventList; + List<EventFm> fmEventList; - public void setFmEventList(List<EventFm> data) { - this.fmEventList = data; - } + public void setFmEventList(List<EventFm> data) { + this.fmEventList = data; + } - public List<EventFm> getFmEventList() { - return fmEventList; - } + public List<EventFm> getFmEventList() { + return fmEventList; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/GNBCUUPFunction.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/GNBCUUPFunction.java index 40518de..cee385b 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/GNBCUUPFunction.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/GNBCUUPFunction.java @@ -26,26 +26,27 @@ import com.fasterxml.jackson.annotation.JsonInclude; public class GNBCUUPFunction { private String idGNBCUUPFunction; - + private Attributes attributes; - + public String getIdGNBCUUPFunction() { return idGNBCUUPFunction; } + public void setIdGNBCUUPFunction(String idGNBCUUPFunction) { this.idGNBCUUPFunction = idGNBCUUPFunction; } + public Attributes getAttributes() { return attributes; } + public void setAttributes(Attributes attributes) { this.attributes = attributes; } - - public GNBCUUPFunction() - { - + + public GNBCUUPFunction() { + } - -} +} diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/GNBDUFunction.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/GNBDUFunction.java index 96860c1..a0dba9e 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/GNBDUFunction.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/GNBDUFunction.java @@ -20,41 +20,46 @@ package org.onap.ransim.websocket.model; -import java.util.List; -import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; @JsonInclude(JsonInclude.Include.NON_NULL) public class GNBDUFunction { - + private String idGNBDUFunction; - + private Attributes attributes; - + @JsonProperty("NRCellDU") public List<NRCellDU> nRCellDU; - + public String getIdGNBDUFunction() { - return idGNBDUFunction; + return idGNBDUFunction; } + public void setIdGNBDUFunction(String idGNBDUFunction) { - this.idGNBDUFunction = idGNBDUFunction; + this.idGNBDUFunction = idGNBDUFunction; } + public Attributes getAttributes() { - return attributes; + return attributes; } + public void setAttributes(Attributes attributes) { - this.attributes = attributes; + this.attributes = attributes; } + public List<NRCellDU> getnRCellDU() { - return nRCellDU; + return nRCellDU; } + public void setnRCellDU(List<NRCellDU> nRCellDU) { - this.nRCellDU = nRCellDU; - } - public GNBDUFunction() - { - + this.nRCellDU = nRCellDU; } -} + public GNBDUFunction() { + + } +} diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/Measurement.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/Measurement.java index 0417d81..e84bfed 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/Measurement.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/Measurement.java @@ -17,29 +17,30 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.ransim.websocket.model; import java.util.List; public class Measurement { - private int measurementInterval; - private List<AdditionalMeasurements> additionalMeasurements; + private int measurementInterval; + private List<AdditionalMeasurements> additionalMeasurements; - public int getMeasurementInterval() { - return measurementInterval; - } + public int getMeasurementInterval() { + return measurementInterval; + } - public void setMeasurementInterval(int measurementInterval) { - this.measurementInterval = measurementInterval; - } + public void setMeasurementInterval(int measurementInterval) { + this.measurementInterval = measurementInterval; + } - public List<AdditionalMeasurements> getAdditionalMeasurements() { - return additionalMeasurements; - } + public List<AdditionalMeasurements> getAdditionalMeasurements() { + return additionalMeasurements; + } - public void setAdditionalMeasurements(List<AdditionalMeasurements> additionalMeasurements) { - this.additionalMeasurements = additionalMeasurements; - } + public void setAdditionalMeasurements(List<AdditionalMeasurements> additionalMeasurements) { + this.additionalMeasurements = additionalMeasurements; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/MessageTypes.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/MessageTypes.java index 295b3bf..28fd704 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/MessageTypes.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/MessageTypes.java @@ -21,19 +21,19 @@ package org.onap.ransim.websocket.model; public class MessageTypes { - public final static String RC_TO_HC_FMDATA = "FmData"; - public final static String RC_TO_HC_PMDATA = "PmData"; - public final static String RC_TO_HC_SETCONFIGTOPO = "INITIAL_CONFIG"; - public final static String RC_TO_HC_UPDCELL = "UpdateCell"; - public final static String RC_TO_HC_PING = "PING"; - public final static String RC_TO_HC_PMFILEDATA = "RC_TO_HC_PMFILEDATA"; - public final static String HC_TO_RC_MODPCI = "ModifyPci"; - public final static String HC_TO_RC_MODANR = "ModifyAnr"; - public final static String HC_TO_RC_RTRIC = "RTRIC_CONFIG"; - public final static String HC_TO_RC_RRM_POLICY = "HC_TO_RC_RRM_POLICY"; - public final static String HC_TO_RC_PLMN = "HC_TO_RC_PLMN"; - public final static String HC_TO_RC_SLICE_PROFILE = "HC_TO_RC_SLICE_PROFILE"; - public final static String HC_TO_RC_RRM_POLICY_DEL = "HC_TO_RC_RRM_POLICY_DEL"; - public final static String HC_TO_RC_PLMN_DEL = "HC_TO_RC_PLMN_DEL"; - public final static String HC_TO_RC_SLICE_PROFILE_DEL = "HC_TO_RC_SLICE_PROFILE_DEL"; + public final static String RC_TO_HC_FMDATA = "FmData"; + public final static String RC_TO_HC_PMDATA = "PmData"; + public final static String RC_TO_HC_SETCONFIGTOPO = "INITIAL_CONFIG"; + public final static String RC_TO_HC_UPDCELL = "UpdateCell"; + public final static String RC_TO_HC_PING = "PING"; + public final static String RC_TO_HC_PMFILEDATA = "RC_TO_HC_PMFILEDATA"; + public final static String HC_TO_RC_MODPCI = "ModifyPci"; + public final static String HC_TO_RC_MODANR = "ModifyAnr"; + public final static String HC_TO_RC_RTRIC = "RTRIC_CONFIG"; + public final static String HC_TO_RC_RRM_POLICY = "HC_TO_RC_RRM_POLICY"; + public final static String HC_TO_RC_PLMN = "HC_TO_RC_PLMN"; + public final static String HC_TO_RC_SLICE_PROFILE = "HC_TO_RC_SLICE_PROFILE"; + public final static String HC_TO_RC_RRM_POLICY_DEL = "HC_TO_RC_RRM_POLICY_DEL"; + public final static String HC_TO_RC_PLMN_DEL = "HC_TO_RC_PLMN_DEL"; + public final static String HC_TO_RC_SLICE_PROFILE_DEL = "HC_TO_RC_SLICE_PROFILE_DEL"; } 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 209c5fd..a85d846 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,32 +24,32 @@ import java.util.List; public class ModifyNeighbor { - private String pnfName; - private String cellId; - private List<NeighborHo> neighborList; + private String pnfName; + private String cellId; + private List<NeighborHo> neighborList; - public String getPnfName() { - return pnfName; - } + public String getPnfName() { + return pnfName; + } - public void setPnfName(String pnfName) { - this.pnfName = pnfName; - } + public void setPnfName(String pnfName) { + this.pnfName = pnfName; + } - public String getCellId() { - return cellId; - } + public String getCellId() { + return cellId; + } - public void setCellId(String cellId) { - this.cellId = cellId; - } + public void setCellId(String cellId) { + this.cellId = cellId; + } - public List<NeighborHo> getNeighborList() { - return neighborList; - } + public List<NeighborHo> getNeighborList() { + return neighborList; + } - public void setNeighborList(List<NeighborHo> neighborList) { - this.neighborList = neighborList; - } + public void setNeighborList(List<NeighborHo> neighborList) { + this.neighborList = neighborList; + } } 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 7214ae8..7687f22 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,84 +24,84 @@ import java.util.List; public class ModifyPci { - private String pnfName; - - private long pciId; - - private String cellId; - - private List<Neighbor> neighborList; - - public long getPciId() { - return pciId; - } - - public void setPciId(long pciId) { - this.pciId = pciId; - } - - public String getCellId() { - return cellId; - } - - public void setCellId(String cellId) { - this.cellId = cellId; - } - - @Override - public String toString() { - return "ModifyPci [PnfName = " + pnfName + ", PciId = " + pciId + ", cellId = " + cellId + "neighborList:" - + neighborList + "]"; - } - - public ModifyPci() { - } - - /** - * Modify Pci value from sdnr. - * - * @param pnfName server id name - * @param pciId pci number - * @param cellId node id for the cell - * @param neighborList neighbor list for the cell - */ - public ModifyPci(String pnfName, long pciId, String cellId, List<Neighbor> neighborList) { - super(); - this.pnfName = pnfName; - this.pciId = pciId; - this.cellId = cellId; - this.neighborList = neighborList; - } - - public String getPnfName() { - return pnfName; - } - - public void setPnfName(String pnfName) { - this.pnfName = pnfName; - } - - 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 (pnfName == null || pnfName.trim().equals("")) { - return false; - } - if (cellId == null || cellId.trim().equals("")) { - return false; - } - return true; - } + private String pnfName; + + private long pciId; + + private String cellId; + + private List<Neighbor> neighborList; + + public long getPciId() { + return pciId; + } + + public void setPciId(long pciId) { + this.pciId = pciId; + } + + public String getCellId() { + return cellId; + } + + public void setCellId(String cellId) { + this.cellId = cellId; + } + + @Override + public String toString() { + return "ModifyPci [PnfName = " + pnfName + ", PciId = " + pciId + ", cellId = " + cellId + "neighborList:" + + neighborList + "]"; + } + + public ModifyPci() { + } + + /** + * Modify Pci value from sdnr. + * + * @param pnfName server id name + * @param pciId pci number + * @param cellId node id for the cell + * @param neighborList neighbor list for the cell + */ + public ModifyPci(String pnfName, long pciId, String cellId, List<Neighbor> neighborList) { + super(); + this.pnfName = pnfName; + this.pciId = pciId; + this.cellId = cellId; + this.neighborList = neighborList; + } + + public String getPnfName() { + return pnfName; + } + + public void setPnfName(String pnfName) { + this.pnfName = pnfName; + } + + 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 (pnfName == null || pnfName.trim().equals("")) { + return false; + } + if (cellId == null || cellId.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 c631c5a..bc6003f 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 @@ -19,34 +19,38 @@ */ package org.onap.ransim.websocket.model; + import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_NULL) public class NRCellDU { private String idNRCellDU; - + private Attributes attributes; public String getIdNRCellDU() { - return idNRCellDU; + return idNRCellDU; } + public void setIdNRCellDU(String idNRCellDU) { - this.idNRCellDU = idNRCellDU; + this.idNRCellDU = idNRCellDU; } + public Attributes getAttributes() { - return attributes; + return attributes; } + public void setAttributes(Attributes attributes) { - this.attributes = attributes; + this.attributes = attributes; } + public NRCellDU(Attributes attributes) { - super(); - this.attributes = attributes; + super(); + this.attributes = attributes; } - public NRCellDU() - { - + + public NRCellDU() { + } } - diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NearRTRIC.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NearRTRIC.java index f684781..0178fa1 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NearRTRIC.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/NearRTRIC.java @@ -20,49 +20,57 @@ package org.onap.ransim.websocket.model; -import java.util.List; -import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; @JsonInclude(JsonInclude.Include.NON_NULL) public class NearRTRIC { - - private String idNearRTRIC; - - private Attributes attributes; - - @JsonProperty("GNBDUFunction") - private List<GNBDUFunction> gNBDUFunction; - - @JsonProperty("GNBCUUPFunction") - private List<GNBCUUPFunction> gNBCUUPFunction; - - public String getIdNearRTRIC () { - return idNearRTRIC; - } - public void setIdNearRTRIC(String idNearRTRIC) { - this.idNearRTRIC = idNearRTRIC; - } - public Attributes getAttributes() { - return attributes; - } - public void setAttributes(Attributes attributes) { - this.attributes = attributes; - } - public List<GNBDUFunction> getgNBDUFunction() { - return gNBDUFunction; - } - public void setgNBDUFunction(List<GNBDUFunction> gNBDUFunction) { - this.gNBDUFunction = gNBDUFunction; - } - public List<GNBCUUPFunction> getgNBCUUPFunction() { - return gNBCUUPFunction; - } - public void setgNBCUUPFunction(List<GNBCUUPFunction> gNBCUUPFunction) { - this.gNBCUUPFunction = gNBCUUPFunction; - } - public NearRTRIC() - { - - } + + private String idNearRTRIC; + + private Attributes attributes; + + @JsonProperty("GNBDUFunction") + private List<GNBDUFunction> gNBDUFunction; + + @JsonProperty("GNBCUUPFunction") + private List<GNBCUUPFunction> gNBCUUPFunction; + + public String getIdNearRTRIC() { + return idNearRTRIC; + } + + public void setIdNearRTRIC(String idNearRTRIC) { + this.idNearRTRIC = idNearRTRIC; + } + + public Attributes getAttributes() { + return attributes; + } + + public void setAttributes(Attributes attributes) { + this.attributes = attributes; + } + + public List<GNBDUFunction> getgNBDUFunction() { + return gNBDUFunction; + } + + public void setgNBDUFunction(List<GNBDUFunction> gNBDUFunction) { + this.gNBDUFunction = gNBDUFunction; + } + + public List<GNBCUUPFunction> getgNBCUUPFunction() { + return gNBCUUPFunction; + } + + public void setgNBCUUPFunction(List<GNBCUUPFunction> gNBCUUPFunction) { + this.gNBCUUPFunction = gNBCUUPFunction; + } + + public NearRTRIC() { + + } } 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 59d9659..e64caf0 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 @@ -22,68 +22,68 @@ package org.onap.ransim.websocket.model; public class Neighbor { - private String plmnId; - private String nodeId; - private long physicalCellId; - private String serverId; - private String pnfName; - private boolean blacklisted; - - public String getPlmnId() { - return plmnId; - } - - public void setPlmnId(String plmnId) { - this.plmnId = plmnId; - } - - 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 getServerId() { - return serverId; - } - - public void setServerId(String serverId) { - this.serverId = serverId; - } - - public String getPnfName() { - return pnfName; - } - - public void setPnfName(String pnfName) { - this.pnfName = pnfName; - } - - public Neighbor() { - // TODO Auto-generated constructor stub - } - - public boolean isBlacklisted() { - return blacklisted; - } - - public void setBlacklisted(boolean blacklisted) { - this.blacklisted = blacklisted; - } - - @Override - public String toString() { - return "Neighbor [nodeId=" + nodeId + ", physicalCellId=" + physicalCellId + ", serverId=" + serverId - + ", pnfName=" + pnfName + "]"; - } + private String plmnId; + private String nodeId; + private long physicalCellId; + private String serverId; + private String pnfName; + private boolean blacklisted; + + public String getPlmnId() { + return plmnId; + } + + public void setPlmnId(String plmnId) { + this.plmnId = plmnId; + } + + 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 getServerId() { + return serverId; + } + + public void setServerId(String serverId) { + this.serverId = serverId; + } + + public String getPnfName() { + return pnfName; + } + + public void setPnfName(String pnfName) { + this.pnfName = pnfName; + } + + public Neighbor() { + // TODO Auto-generated constructor stub + } + + public boolean isBlacklisted() { + return blacklisted; + } + + public void setBlacklisted(boolean blacklisted) { + this.blacklisted = blacklisted; + } + + @Override + public String toString() { + return "Neighbor [nodeId=" + nodeId + ", physicalCellId=" + physicalCellId + ", serverId=" + serverId + + ", pnfName=" + pnfName + "]"; + } } 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 4bccb6d..8d8abd7 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 nodeId; + private long pciId; + private boolean 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 long getPciId() { - return pciId; - } + public long getPciId() { + return pciId; + } - public void setPciId(long pciId) { - this.pciId = pciId; - } + public void setPciId(long pciId) { + this.pciId = pciId; + } - 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/websocket/model/PmMessage.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/PmMessage.java index 9bdf27a..da64c0c 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/PmMessage.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/PmMessage.java @@ -24,14 +24,14 @@ import java.util.List; public class PmMessage { - List<EventPm> eventPmList; + List<EventPm> eventPmList; - public void setEventPmList(List<EventPm> data) { - this.eventPmList = data; - } + public void setEventPmList(List<EventPm> data) { + this.eventPmList = data; + } - public List<EventPm> getEventPmList() { - return eventPmList; - } + public List<EventPm> getEventPmList() { + return eventPmList; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/RanNetwork.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/RanNetwork.java index e03f9f3..cd72f18 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/RanNetwork.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/RanNetwork.java @@ -1,47 +1,46 @@ -/*-
- * ============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;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class RanNetwork {
-
- @JsonProperty("NearRTRIC")
- private List<NearRTRIC> nearRTRIC;
-
- public List<NearRTRIC> getNearRTRIC() {
- return nearRTRIC;
- }
-
- public void setNearRTRIC(List<NearRTRIC> nearRTRIC) {
- this.nearRTRIC = nearRTRIC;
- }
-
- public RanNetwork()
- {
-
- }
-
-}
-
+/*- + * ============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 com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +@JsonInclude(JsonInclude.Include.NON_NULL) +public class RanNetwork { + + @JsonProperty("NearRTRIC") + private List<NearRTRIC> nearRTRIC; + + public List<NearRTRIC> getNearRTRIC() { + return nearRTRIC; + } + + public void setNearRTRIC(List<NearRTRIC> nearRTRIC) { + this.nearRTRIC = nearRTRIC; + } + + public RanNetwork() { + + } + +} diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/SNSSAI.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/SNSSAI.java index 2558b91..2e8d78b 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/SNSSAI.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/SNSSAI.java @@ -1,51 +1,51 @@ -/*
- * ============LICENSE_START=======================================================
- * Ran Simulator Controller
- * ================================================================================
- * Copyright (C) 2020-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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.ransim.websocket.model;
-
-import java.util.*;
-
-public class SNSSAI {
-
- private String sNssai;
-
- private List<ConfigData> configData;
-
- public String getSNssai() {
- return sNssai;
- }
-
- public void setSNssai(String sNssai) {
- this.sNssai = sNssai;
- }
-
- public List<ConfigData> getConfigData() {
- return configData;
- }
-
- public void setConfigData(List<ConfigData> configData) {
- this.configData = configData;
- }
-
- public SNSSAI() {
-
- }
-
-}
+/* + * ============LICENSE_START======================================================= + * Ran Simulator Controller + * ================================================================================ + * Copyright (C) 2020-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. + * ============LICENSE_END========================================================= + */ + +package org.onap.ransim.websocket.model; + +import java.util.*; + +public class SNSSAI { + + private String sNssai; + + private List<ConfigData> configData; + + public String getSNssai() { + return sNssai; + } + + public void setSNssai(String sNssai) { + this.sNssai = sNssai; + } + + public List<ConfigData> getConfigData() { + return configData; + } + + public void setConfigData(List<ConfigData> configData) { + this.configData = configData; + } + + public SNSSAI() { + + } + +} diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/SetConfigTopology.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/SetConfigTopology.java index d61e5c3..4cec62b 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/SetConfigTopology.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/SetConfigTopology.java @@ -24,70 +24,70 @@ import java.util.List; public class SetConfigTopology { - private String serverId; - private String uuid; - private String ip; - private String netconfPort; - private List<Topology> topology; - - public SetConfigTopology() { - - } - - /** - * Cell details for the given netconf server. - * - * @param serverId netconf server id - * @param ip ip address - * @param netconfPort port number - * @param topology cell topology for given server id - */ - public SetConfigTopology(String serverId, String ip, String netconfPort, List<Topology> topology) { - super(); - this.serverId = serverId; - this.ip = ip; - this.netconfPort = netconfPort; - this.topology = topology; - } - - public String getServerId() { - return serverId; - } - - public void setServerId(String serverId) { - this.serverId = serverId; - } - - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; - } - - 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 List<Topology> getTopology() { - return topology; - } - - public void setTopology(List<Topology> topology) { - this.topology = topology; - } + private String serverId; + private String uuid; + private String ip; + private String netconfPort; + private List<Topology> topology; + + public SetConfigTopology() { + + } + + /** + * Cell details for the given netconf server. + * + * @param serverId netconf server id + * @param ip ip address + * @param netconfPort port number + * @param topology cell topology for given server id + */ + public SetConfigTopology(String serverId, String ip, String netconfPort, List<Topology> topology) { + super(); + this.serverId = serverId; + this.ip = ip; + this.netconfPort = netconfPort; + this.topology = topology; + } + + public String getServerId() { + return serverId; + } + + public void setServerId(String serverId) { + this.serverId = serverId; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + 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 List<Topology> getTopology() { + return topology; + } + + public void setTopology(List<Topology> topology) { + this.topology = topology; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/SlicingPmMessage.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/SlicingPmMessage.java index 13a6b4d..077abcd 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/SlicingPmMessage.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/SlicingPmMessage.java @@ -1,83 +1,84 @@ -/*-
- * ============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;
-
-public class SlicingPmMessage {
-
- private String sourceName;
- private String fileName;
- private double startEpochMicrosec;
- private double lastEpochMicrosec;
- private String pmData;
-
- public String getSourceName() {
- return sourceName;
- }
-
- public void setSourceName(String sourceName) {
- this.sourceName = sourceName;
- }
-
- public String getFileName() {
- return fileName;
- }
-
- public void setFileName(String fileName) {
- this.fileName = fileName;
- }
-
- public double getStartEpochMicrosec() {
- return startEpochMicrosec;
- }
-
- public void setStartEpochMicrosec(double startEpochMicrosec) {
- this.startEpochMicrosec = startEpochMicrosec;
- }
-
- public double getLastEpochMicrosec() {
- return lastEpochMicrosec;
- }
-
- public void setLastEpochMicrosec(double lastEpochMicrosec) {
- this.lastEpochMicrosec = lastEpochMicrosec;
- }
-
- public String getPmData() {
- return pmData;
- }
-
- public void setPmData(String pmData) {
- this.pmData = pmData;
- }
-
- public SlicingPmMessage(String sourceName, String fileName, double startEpochMicrosec, double lastEpochMicrosec, String pmData) {
- this.sourceName = sourceName;
- this.fileName = fileName;
- this.startEpochMicrosec = startEpochMicrosec;
- this.lastEpochMicrosec = lastEpochMicrosec;
- this.pmData = pmData;
- }
-
- public SlicingPmMessage() {
-
- }
-
-}
+/*- + * ============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; + +public class SlicingPmMessage { + + private String sourceName; + private String fileName; + private double startEpochMicrosec; + private double lastEpochMicrosec; + private String pmData; + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public double getStartEpochMicrosec() { + return startEpochMicrosec; + } + + public void setStartEpochMicrosec(double startEpochMicrosec) { + this.startEpochMicrosec = startEpochMicrosec; + } + + public double getLastEpochMicrosec() { + return lastEpochMicrosec; + } + + public void setLastEpochMicrosec(double lastEpochMicrosec) { + this.lastEpochMicrosec = lastEpochMicrosec; + } + + public String getPmData() { + return pmData; + } + + public void setPmData(String pmData) { + this.pmData = pmData; + } + + public SlicingPmMessage(String sourceName, String fileName, double startEpochMicrosec, double lastEpochMicrosec, + String pmData) { + this.sourceName = sourceName; + this.fileName = fileName; + this.startEpochMicrosec = startEpochMicrosec; + this.lastEpochMicrosec = lastEpochMicrosec; + this.pmData = pmData; + } + + public SlicingPmMessage() { + + } + +} diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/Topology.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/Topology.java index 9869ea4..56ce746 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/Topology.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/Topology.java @@ -24,69 +24,69 @@ import java.util.List; public class Topology { - private String pnfName; - - private long pciId; - - private String cellId; - - private List<Neighbor> neighborList; - - public long getPciId() { - return pciId; - } - - public void setPciId(long pciId) { - this.pciId = pciId; - } - - public String getCellId() { - return cellId; - } - - public void setCellId(String cellId) { - this.cellId = cellId; - } - - public List<Neighbor> getNeighborList() { - return neighborList; - } - - public void setNeighborList(List<Neighbor> neighborList) { - this.neighborList = neighborList; - } - - @Override - public String toString() { - return "Topology [PnfName = " + pnfName + ", PciId = " + pciId + ", cellId = " + cellId + ", neighborList = " - + neighborList + "]"; - } - - /** - * Contails the necessary cell details. - * - * @param pnfName server id name - * @param pciId pci number - * @param cellId node id for the cel - * @param neighborList neighbor list for the cell - */ - public Topology(String pnfName, long pciId, String cellId, List<Neighbor> neighborList) { - super(); - this.pnfName = pnfName; - this.pciId = pciId; - this.cellId = cellId; - this.neighborList = neighborList; - } - - public Topology() { - } - - public String getPnfName() { - return pnfName; - } - - public void setPnfName(String pnfName) { - this.pnfName = pnfName; - } + private String pnfName; + + private long pciId; + + private String cellId; + + private List<Neighbor> neighborList; + + public long getPciId() { + return pciId; + } + + public void setPciId(long pciId) { + this.pciId = pciId; + } + + public String getCellId() { + return cellId; + } + + public void setCellId(String cellId) { + this.cellId = cellId; + } + + public List<Neighbor> getNeighborList() { + return neighborList; + } + + public void setNeighborList(List<Neighbor> neighborList) { + this.neighborList = neighborList; + } + + @Override + public String toString() { + return "Topology [PnfName = " + pnfName + ", PciId = " + pciId + ", cellId = " + cellId + ", neighborList = " + + neighborList + "]"; + } + + /** + * Contails the necessary cell details. + * + * @param pnfName server id name + * @param pciId pci number + * @param cellId node id for the cel + * @param neighborList neighbor list for the cell + */ + public Topology(String pnfName, long pciId, String cellId, List<Neighbor> neighborList) { + super(); + this.pnfName = pnfName; + this.pciId = pciId; + this.cellId = cellId; + this.neighborList = neighborList; + } + + public Topology() { + } + + public String getPnfName() { + return pnfName; + } + + public void setPnfName(String pnfName) { + this.pnfName = pnfName; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/UpdateCell.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/UpdateCell.java index e515172..43494a1 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/UpdateCell.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/model/UpdateCell.java @@ -22,60 +22,60 @@ package org.onap.ransim.websocket.model; public class UpdateCell { - private String serverId; - private String ip; - private String netconfPort; - Topology oneCell; + private String serverId; + private String ip; + private String netconfPort; + Topology oneCell; - public UpdateCell() { - } + public UpdateCell() { + } - public String getServerId() { - return serverId; - } + public String getServerId() { + return serverId; + } - public void setServerId(String serverId) { - this.serverId = serverId; - } + public void setServerId(String serverId) { + this.serverId = serverId; + } - public String getIp() { - return ip; - } + public String getIp() { + return ip; + } - public void setIp(String ip) { - this.ip = ip; - } + public void setIp(String ip) { + this.ip = ip; + } - public String getNetconfPort() { - return netconfPort; - } + public String getNetconfPort() { + return netconfPort; + } - public void setNetconfPort(String netconfPort) { - this.netconfPort = netconfPort; - } + public void setNetconfPort(String netconfPort) { + this.netconfPort = netconfPort; + } - public Topology getOneCell() { - return oneCell; - } + public Topology getOneCell() { + return oneCell; + } - public void setOneCell(Topology oneCell) { - this.oneCell = oneCell; - } + public void setOneCell(Topology oneCell) { + this.oneCell = oneCell; + } - /** - * Update cell details based on input. - * - * @param serverId netconf server id - * @param ip ip address - * @param netconfPort port number - * @param oneCell topology details - */ - public UpdateCell(String serverId, String ip, String netconfPort, Topology oneCell) { - super(); - this.serverId = serverId; - this.ip = ip; - this.netconfPort = netconfPort; - this.oneCell = oneCell; - } + /** + * Update cell details based on input. + * + * @param serverId netconf server id + * @param ip ip address + * @param netconfPort port number + * @param oneCell topology details + */ + public UpdateCell(String serverId, String ip, String netconfPort, Topology oneCell) { + super(); + this.serverId = serverId; + this.ip = ip; + this.netconfPort = netconfPort; + this.oneCell = oneCell; + } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/server/RansimWebSocketServer.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/server/RansimWebSocketServer.java index c58feeb..3061fad 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/server/RansimWebSocketServer.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/websocket/server/RansimWebSocketServer.java @@ -23,13 +23,13 @@ package org.onap.ransim.websocket.server; import java.io.IOException; import javax.websocket.CloseReason; +import javax.websocket.EncodeException; import javax.websocket.OnClose; import javax.websocket.OnMessage; import javax.websocket.OnOpen; import javax.websocket.Session; import javax.websocket.server.PathParam; import javax.websocket.server.ServerEndpoint; -import javax.websocket.EncodeException; import org.apache.log4j.Logger; import org.onap.ransim.rest.api.services.RansimControllerServices; @@ -41,214 +41,221 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @Controller -@ServerEndpoint(value = "/RansimAgent/{IpPort}", encoders = { DeviceDataEncoder.class }, decoders = { - DeviceDataDecoder.class }) +@ServerEndpoint( + value = "/RansimAgent/{IpPort}", + encoders = {DeviceDataEncoder.class}, + decoders = {DeviceDataDecoder.class}) public class RansimWebSocketServer { - static Logger log = Logger.getLogger(RansimWebSocketServer.class.getName()); - - private static RansimControllerServices rscServices; - - @Autowired - public void setRscServices(RansimControllerServices service){ - this.rscServices=service; - } - /** - * Set of actions to be done when connection is opened. - * - * @param session Session details - * @param ipPort ip address of the agent - */ - @OnOpen - public void onOpen(Session session, @PathParam("IpPort") String ipPort) { - try { - String useCaseType = RansimControllerServices.useCaseType; - switch(useCaseType) { - case "sonUsecase": - log.info("RansimWebSocketServer : Assign serverId wrt SlicingUsecase"); - String serverId = rscServices.addWebSocketSessions(ipPort, session); - if (serverId != null) { - log.info("New websocket session added for " + serverId); - rscServices.sendInitialConfigForNewAgent(ipPort, serverId); - } else { - log.info("RansimWebSocketServer: No assigned ServerId found - No intial configuration sent to New Agent " + ipPort); - } - break; - case "ranSlicingUsecase": - log.info("RansimWebSocketServer : Assign serverId wrt RANSlicingUsecase"); - String ranServerId = rscServices.addRanWebSocketSessions(ipPort, session); - if (ranServerId != null) { - log.info("New websocket session added for " + ranServerId); - rscServices.sendRanInitialConfigForNewAgent(ipPort, ranServerId); - } else { - log.info("RansimWebSocketServer: No assigned ServerId found - No intial configuration sent to New Agent " + ipPort); - } - break; - default: - log.info("RansimWebSocketServer: No assigned ServerId found"); - } - } catch (Exception e) { - log.info("Exception in onOpen:", e); - } - } - - /** - * Handles the message sent from the agent. - * - * @param message message sent from the agent - * @param session session details - * @param ipPort ip address public void onMessage(DeviceData message, Session - * session, @PathParam("IpPort") String ipPort) { - */ - @OnMessage - public void onMessage(final DeviceData message, final Session session, @PathParam("IpPort") String ipPort) - throws IOException, EncodeException { - log.info("WSS Obj Message received from client(" + ipPort + ") with id " + session.getId()); - try { - if (message != null) { - if (message.getMessage() == null || message.getMessage().trim().equals("")) { - log.debug("Periodic ping message.... ignore"); - return; - } else { - - if (message.getType().equals(MessageTypes.HC_TO_RC_MODPCI)) { - log.info("Modify pci message received"); - rscServices.handleModifyPciFromSdnr(message.getMessage(), session, ipPort); - } else if (message.getType().equals(MessageTypes.HC_TO_RC_MODANR)) { - log.info("Modify anr message received"); - rscServices.handleModifyNeighborFromSdnr(message.getMessage(), session, ipPort); - } else if (message.getType().equals(MessageTypes.HC_TO_RC_RTRIC)) { - log.info("Distribute RTRIC Config message received"); - rscServices.handleRTRICConfigFromSdnr(message.getMessage(), session, ipPort); - } else if(message.getType().equals(MessageTypes.HC_TO_RC_RRM_POLICY)){ - log.info("Add RRMPolicyRatio message received"); - rscServices.handleRRMPolicyRatioUpdateFromSdnr(message.getMessage(), session, ipPort); - } else if(message.getType().equals(MessageTypes.HC_TO_RC_PLMN)){ - log.info("Add PLMNInfo message received"); - rscServices.handlePLMNInfoUpdateFromSdnr(message.getMessage(), session, ipPort); - } else if(message.getType().equals(MessageTypes.HC_TO_RC_SLICE_PROFILE)){ - log.info("Add SliceProfile message received"); - rscServices.handleSliceProfileUpdateFromSdnr(message.getMessage(), session, ipPort); - } else if(message.getType().equals(MessageTypes.HC_TO_RC_RRM_POLICY_DEL)){ - log.info("Delete RRMPolicyRatio message received"); - rscServices.handleRRMPolicyRatioDeleteFromSdnr(message.getMessage(), session, ipPort); - } else if(message.getType().equals(MessageTypes.HC_TO_RC_PLMN_DEL)){ - log.info("Delete PLMNInfo message received"); - rscServices.handlePLMNInfoDeleteFromSdnr(message.getMessage(), session, ipPort); - } else if(message.getType().equals(MessageTypes.HC_TO_RC_SLICE_PROFILE_DEL)){ - log.info("Delete SliceProfile message received"); - rscServices.handleSliceProfileDeleteFromSdnr(message.getMessage(), session, ipPort); - } - - } - } - } catch (Exception e) { - log.info("Exception in onMessage:", e); - } - } - - /** - * Set of actions to be done when connection is closed. - * - * @param reason reason the session was closed - * @param session session details - * @param ipPort ip address - */ - @OnClose - public void onClose(CloseReason reason, Session session, @PathParam("IpPort") String ipPort) { - try { - log.info("WSS Closing client(" + ipPort + ") cxn with id " + session.getId() + "due to " - + reason.getReasonPhrase()); - rscServices.removeWebSocketSessions(ipPort); - } catch (Exception e) { - log.info("Exception in onClose:", e); - } - } - - public static void sendUpdateCellMessage(String str, Session session) { - DeviceData data = new DeviceData(); - data.setType(MessageTypes.RC_TO_HC_UPDCELL); - data.setMessage(str); - try { - sendMessage(data, session); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static void sendPmMessage(String str, Session session) { - DeviceData data = new DeviceData(); - data.setType(MessageTypes.RC_TO_HC_PMDATA); - data.setMessage(str); - log.info("data.setMessage: " + data.getMessage()); - try { - sendMessage(data, session); - } catch (Exception e) { - e.printStackTrace(); - } - } - + static Logger log = Logger.getLogger(RansimWebSocketServer.class.getName()); + + private static RansimControllerServices rscServices; + + @Autowired + public void setRscServices(RansimControllerServices service) { + this.rscServices = service; + } + + /** + * Set of actions to be done when connection is opened. + * + * @param session Session details + * @param ipPort ip address of the agent + */ + @OnOpen + public void onOpen(Session session, @PathParam("IpPort") String ipPort) { + try { + String useCaseType = RansimControllerServices.useCaseType; + switch (useCaseType) { + case "sonUsecase": + log.info("RansimWebSocketServer : Assign serverId wrt SlicingUsecase"); + String serverId = rscServices.addWebSocketSessions(ipPort, session); + if (serverId != null) { + log.info("New websocket session added for " + serverId); + rscServices.sendInitialConfigForNewAgent(ipPort, serverId); + } else { + log.info( + "RansimWebSocketServer: No assigned ServerId found - No intial configuration sent to New Agent " + + ipPort); + } + break; + case "ranSlicingUsecase": + log.info("RansimWebSocketServer : Assign serverId wrt RANSlicingUsecase"); + String ranServerId = rscServices.addRanWebSocketSessions(ipPort, session); + if (ranServerId != null) { + log.info("New websocket session added for " + ranServerId); + rscServices.sendRanInitialConfigForNewAgent(ipPort, ranServerId); + } else { + log.info( + "RansimWebSocketServer: No assigned ServerId found - No intial configuration sent to New Agent " + + ipPort); + } + break; + default: + log.info("RansimWebSocketServer: No assigned ServerId found"); + } + } catch (Exception e) { + log.info("Exception in onOpen:", e); + } + } + + /** + * Handles the message sent from the agent. + * + * @param message message sent from the agent + * @param session session details + * @param ipPort ip address public void onMessage(DeviceData message, Session + * session, @PathParam("IpPort") String ipPort) { + */ + @OnMessage + public void onMessage(final DeviceData message, final Session session, @PathParam("IpPort") String ipPort) + throws IOException, EncodeException { + log.info("WSS Obj Message received from client(" + ipPort + ") with id " + session.getId()); + try { + if (message != null) { + if (message.getMessage() == null || message.getMessage().trim().equals("")) { + log.debug("Periodic ping message.... ignore"); + return; + } else { + + if (message.getType().equals(MessageTypes.HC_TO_RC_MODPCI)) { + log.info("Modify pci message received"); + rscServices.handleModifyPciFromSdnr(message.getMessage(), session, ipPort); + } else if (message.getType().equals(MessageTypes.HC_TO_RC_MODANR)) { + log.info("Modify anr message received"); + rscServices.handleModifyNeighborFromSdnr(message.getMessage(), session, ipPort); + } else if (message.getType().equals(MessageTypes.HC_TO_RC_RTRIC)) { + log.info("Distribute RTRIC Config message received"); + rscServices.handleRTRICConfigFromSdnr(message.getMessage(), session, ipPort); + } else if (message.getType().equals(MessageTypes.HC_TO_RC_RRM_POLICY)) { + log.info("Add RRMPolicyRatio message received"); + rscServices.handleRRMPolicyRatioUpdateFromSdnr(message.getMessage(), session, ipPort); + } else if (message.getType().equals(MessageTypes.HC_TO_RC_PLMN)) { + log.info("Add PLMNInfo message received"); + rscServices.handlePLMNInfoUpdateFromSdnr(message.getMessage(), session, ipPort); + } else if (message.getType().equals(MessageTypes.HC_TO_RC_SLICE_PROFILE)) { + log.info("Add SliceProfile message received"); + rscServices.handleSliceProfileUpdateFromSdnr(message.getMessage(), session, ipPort); + } else if (message.getType().equals(MessageTypes.HC_TO_RC_RRM_POLICY_DEL)) { + log.info("Delete RRMPolicyRatio message received"); + rscServices.handleRRMPolicyRatioDeleteFromSdnr(message.getMessage(), session, ipPort); + } else if (message.getType().equals(MessageTypes.HC_TO_RC_PLMN_DEL)) { + log.info("Delete PLMNInfo message received"); + rscServices.handlePLMNInfoDeleteFromSdnr(message.getMessage(), session, ipPort); + } else if (message.getType().equals(MessageTypes.HC_TO_RC_SLICE_PROFILE_DEL)) { + log.info("Delete SliceProfile message received"); + rscServices.handleSliceProfileDeleteFromSdnr(message.getMessage(), session, ipPort); + } + + } + } + } catch (Exception e) { + log.info("Exception in onMessage:", e); + } + } + + /** + * Set of actions to be done when connection is closed. + * + * @param reason reason the session was closed + * @param session session details + * @param ipPort ip address + */ + @OnClose + public void onClose(CloseReason reason, Session session, @PathParam("IpPort") String ipPort) { + try { + log.info("WSS Closing client(" + ipPort + ") cxn with id " + session.getId() + "due to " + + reason.getReasonPhrase()); + rscServices.removeWebSocketSessions(ipPort); + } catch (Exception e) { + log.info("Exception in onClose:", e); + } + } + + public static void sendUpdateCellMessage(String str, Session session) { + DeviceData data = new DeviceData(); + data.setType(MessageTypes.RC_TO_HC_UPDCELL); + data.setMessage(str); + try { + sendMessage(data, session); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static void sendPmMessage(String str, Session session) { + DeviceData data = new DeviceData(); + data.setType(MessageTypes.RC_TO_HC_PMDATA); + data.setMessage(str); + log.info("data.setMessage: " + data.getMessage()); + try { + sendMessage(data, session); + } catch (Exception e) { + e.printStackTrace(); + } + } + public static void sendIntelligentSlicingPmData(String str, Session session) { - DeviceData data = new DeviceData(); + DeviceData data = new DeviceData(); data.setType(MessageTypes.RC_TO_HC_PMFILEDATA); data.setMessage(str); - log.info("data.setMessage: " + data.getMessage()); - try { - sendMessage(data, session); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static void sendFmMessage(String str, Session session) { - DeviceData data = new DeviceData(); - data.setType(MessageTypes.RC_TO_HC_FMDATA); - data.setMessage(str); - try { - sendMessage(data, session); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static void sendSetConfigTopologyMessage(String str, Session session) { - DeviceData data = new DeviceData(); - data.setType(MessageTypes.RC_TO_HC_SETCONFIGTOPO); - data.setMessage(str); - try { - sendMessage(data, session); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static void sendSetReconfigureMessage(String str, Session session) { - DeviceData data = new DeviceData(); - data.setType(MessageTypes.HC_TO_RC_RTRIC); - data.setMessage(str); - try { - sendMessage(data, session); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static void sendPingMessage(Session session) { - DeviceData data = new DeviceData(); - data.setType(MessageTypes.RC_TO_HC_PING); - data.setMessage(""); - try { - sendMessage(data, session); - } catch (Exception e) { - e.printStackTrace(); - } - } - - private static void sendMessage(DeviceData data, Session session) { - try { - session.getBasicRemote().sendObject(data); - } catch (Exception e) { - log.info("Exception in sendMessage:", e); - } - } + log.info("data.setMessage: " + data.getMessage()); + try { + sendMessage(data, session); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static void sendFmMessage(String str, Session session) { + DeviceData data = new DeviceData(); + data.setType(MessageTypes.RC_TO_HC_FMDATA); + data.setMessage(str); + try { + sendMessage(data, session); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static void sendSetConfigTopologyMessage(String str, Session session) { + DeviceData data = new DeviceData(); + data.setType(MessageTypes.RC_TO_HC_SETCONFIGTOPO); + data.setMessage(str); + try { + sendMessage(data, session); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static void sendSetReconfigureMessage(String str, Session session) { + DeviceData data = new DeviceData(); + data.setType(MessageTypes.HC_TO_RC_RTRIC); + data.setMessage(str); + try { + sendMessage(data, session); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static void sendPingMessage(Session session) { + DeviceData data = new DeviceData(); + data.setType(MessageTypes.RC_TO_HC_PING); + data.setMessage(""); + try { + sendMessage(data, session); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private static void sendMessage(DeviceData data, Session session) { + try { + session.getBasicRemote().sendObject(data); + } catch (Exception e) { + log.info("Exception in sendMessage:", e); + } + } } |