commit d337c93339acfcf5233fc74fd93593ca5636f7ac
author slowr <mavromat@csd.uoc.gr> Fri Aug 18 13:54:02 2017 -0700
committer slowr <mavromat@csd.uoc.gr> Fri Aug 18 13:54:02 2017 -0700
tree 6cfb17d4a2e624bc6aef49843f3d24b08d4bf2e6
parent da15d9ad1f424c4bfafe0bf7d646aff28091d0af

CRNTI to be unique per cell, added fields in configuration, rx_signal from seconds to ms, on cell connection we resend meascells

src/main/java/org.onosproject.xran/impl/XranConfig.java

diff --git a/src/main/java/org.onosproject.xran/impl/XranConfig.java b/src/main/java/org.onosproject.xran/impl/XranConfig.java
index 03cbe13..eac3317 100644
--- a/src/main/java/org.onosproject.xran/impl/XranConfig.java
+++ b/src/main/java/org.onosproject.xran/impl/XranConfig.java
@@ -17,9 +17,7 @@
 package org.onosproject.xran.impl;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import org.apache.commons.lang.exception.ExceptionUtils;
 import org.onosproject.core.ApplicationId;
-import org.onosproject.net.DeviceId;
 import org.onosproject.net.config.Config;
 import org.onosproject.xran.codecs.api.ECGI;
 import org.onosproject.xran.codecs.api.EUTRANCellIdentifier;
@@ -32,18 +30,15 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import static org.onosproject.net.DeviceId.deviceId;
-
 public class XranConfig extends Config<ApplicationId> {
 
     private static final String CELLS = "active_cells";
 
     private static final String PLMN_ID = "plmn_id";
+
     private static final String ECI_ID = "eci";
 
     private static final String IP_ADDR = "ip_addr";
@@ -52,7 +47,7 @@
 
     private static final String XRANC_CELLCONFIG_INTERVAL = "xranc_cellconfigrequest_interval_seconds";
 
-    private static final String RX_SIGNAL_MEAS_REPORT_INTERVAL = "rx_signal_meas_report_interval_seconds";
+    private static final String RX_SIGNAL_MEAS_REPORT_INTERVAL = "rx_signal_meas_report_interval_ms";
 
     private static final String L2_MEAS_REPORT_INTERVAL = "l2_meas_report_interval_ms";
 
@@ -60,6 +55,12 @@
 
     private static final String BEARER_SUCCESS = "bearer_success";
 
+    private static final String NO_MEAS_LINK_REMOVAL = "no_meas_link_removal_ms";
+
+    private static final String IDLE_UE_REMOVAL = "idle_ue_removal_ms";
+
+    private static final String NORTHBOUND_TIMEOUT = "nb_response_timeout_ms";
+
     private final Logger log = LoggerFactory.getLogger(getClass());
 
     public Map<String, ECGI> activeCellSet() {
@@ -110,6 +111,17 @@
         return object.get(L2_MEAS_REPORT_INTERVAL).asInt();
     }
 
+    public int getNoMeasLinkRemoval() {
+        return object.get(NO_MEAS_LINK_REMOVAL).asInt();
+    }
+
+    public int getIdleUeRemoval() {
+        return object.get(IDLE_UE_REMOVAL).asInt();
+    }
+
+    public int getNorthBoundTimeout() {
+        return object.get(NORTHBOUND_TIMEOUT).asInt();
+    }
 
     private ECGI hexToECGI(String plmn_id, String eci) {
         byte[] bytes = HexConverter.fromShortHexString(plmn_id);