commit ed74ec72a77b938f6524e61999105c3a3bc58c11
author slowr <mavromat@csd.uoc.gr> Thu Aug 17 11:25:01 2017 -0700
committer slowr <mavromat@csd.uoc.gr> Thu Aug 17 11:25:01 2017 -0700
tree 831d747d96d43520cda10f8d492a4fe286fb67af
parent d3d7b41f12cd43ac3db4b078629d7975aa081f42

fixed rxsigmeas and version checking

src/main/java/org.onosproject.xran/rest/CellWebResource.java

diff --git a/src/main/java/org.onosproject.xran/rest/CellWebResource.java b/src/main/java/org.onosproject.xran/rest/CellWebResource.java
index d792fa6..e87964e 100644
--- a/src/main/java/org.onosproject.xran/rest/CellWebResource.java
+++ b/src/main/java/org.onosproject.xran/rest/CellWebResource.java
@@ -119,7 +119,7 @@
                     get(XranStore.class).modifyCellRrmConf(cell, rrmConf);
 
                     queue[0] = get(XranController.class).sendModifiedRRMConf(cell.getRrmConfig(),
-                            cell.getVersion().equals("3"));
+                            cell.getVersion() <= 3);
                     String poll = queue[0].poll(5, TimeUnit.SECONDS);
 
                     if (poll != null) {

src/main/java/org.onosproject.xran/rest/LinkWebResource.java

diff --git a/src/main/java/org.onosproject.xran/rest/LinkWebResource.java b/src/main/java/org.onosproject.xran/rest/LinkWebResource.java
index 4deb543..979e84e 100644
--- a/src/main/java/org.onosproject.xran/rest/LinkWebResource.java
+++ b/src/main/java/org.onosproject.xran/rest/LinkWebResource.java
@@ -421,7 +421,7 @@
         final SynchronousQueue<String>[] queue = new SynchronousQueue[1];
         get(XranStore.class).modifyLinkRrmConf(link, rrmConf);
         queue[0] = get(XranController.class).sendModifiedRRMConf(link.getRrmParameters(),
-                link.getLinkId().getCell().getVersion().equals("3"));
+                link.getLinkId().getCell().getVersion() <= 3);
         String poll = queue[0].poll(5, TimeUnit.SECONDS);
 
         if (poll != null) {