commit 60d4d104b6714f6a34ff6b368465965aed6cec14
author slowr <mavromat@csd.uoc.gr> Wed Aug 16 18:33:58 2017 -0700
committer slowr <mavromat@csd.uoc.gr> Wed Aug 16 18:33:58 2017 -0700
tree dc42edab03863d1d09f260d6397a71d7f53f5323
parent 077957a89e8560a28faa0dc3035c14535f0723b4

jackson, HTTP codes and JSON responses, xICIC/RRMConfig fix

src/main/java/org.onosproject.xran/controller/XranControllerImpl.java

diff --git a/src/main/java/org.onosproject.xran/controller/XranControllerImpl.java b/src/main/java/org.onosproject.xran/controller/XranControllerImpl.java
index 185ad8e..5f3bf5b 100644
--- a/src/main/java/org.onosproject.xran/controller/XranControllerImpl.java
+++ b/src/main/java/org.onosproject.xran/controller/XranControllerImpl.java
@@ -44,7 +44,7 @@
 import org.onosproject.xran.wrapper.CellMap;
 import org.onosproject.xran.wrapper.LinkMap;
 import org.onosproject.xran.wrapper.UeMap;
-import org.openmuc.jasn1.ber.types.BerInteger;
+import org.onosproject.xran.codecs.ber.types.BerInteger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -412,7 +412,7 @@
                                                         ChannelHandlerContext ctx = cellMap.getCtx(primary.getEcgi());
                                                         RXSigMeasConfig.MeasCells measCells = new RXSigMeasConfig.MeasCells();
                                                         xranStore.getCellNodes().forEach(cell -> {
-                                                            CellConfigReport cellReport = cell.getConf();
+                                                            CellConfigReport cellReport = ((RnibCell) cell).getConf();
                                                             if (cellReport != null) {
                                                                 PCIARFCN pciarfcn = new PCIARFCN();
                                                                 pciarfcn.setPci(cellReport.getPci());
@@ -821,8 +821,8 @@
                         if (cell != null) {
                             RnibLink link = linkMap.get(cell.getEcgi(), schedMeasReportPerUE.getCrnti());
                             if (link != null) {
-                                link.getQuality().setMcs_dl(servCell.getMcsDl());
-                                link.getQuality().setMcs_ul(servCell.getMcsUl());
+                                link.getQuality().setMcsDl(servCell.getMcsDl());
+                                link.getQuality().setMcsUl(servCell.getMcsUl());
 
                                 link.getResourceUsage().setDl(servCell.getPrbUsage().getPrbUsageDl());
                                 link.getResourceUsage().setUl(servCell.getPrbUsage().getPrbUsageUl());
@@ -946,7 +946,7 @@
                     break;
                 }
                 default: {
-                    log.warn("Wrong API ID");
+                    log.warn("Wrong API ID: {}", recv_pdu);
                     break;
                 }
             }