commit 73b4eae3dcb447e060e170bd3d63cafadadd6ba7
author slowr <mavromat@csd.uoc.gr> Thu Aug 17 16:09:09 2017 -0700
committer slowr <mavromat@csd.uoc.gr> Thu Aug 17 16:09:09 2017 -0700
tree 16e8f85c4b748c08f15bb9185fd90efed3ab843f
parent 7bebd7b505ef32c65827d35ff8ab987ed2296729

fixed HO, xICIC timeout and Context Update

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 979e84e..097cab9 100644
--- a/src/main/java/org.onosproject.xran/rest/LinkWebResource.java
+++ b/src/main/java/org.onosproject.xran/rest/LinkWebResource.java
@@ -260,8 +260,8 @@
 
         return ResponseHelper.getResponse(
                 mapper(),
-                ResponseHelper.statusCode.NOT_IMPLEMENTED,
-                "Not Implemented",
+                ResponseHelper.statusCode.BAD_REQUEST,
+                "Bad Request",
                 "The command you specified is not implemented or doesn't exist. We support " +
                         "type/RRMConf/traficpercent commands."
         );
@@ -392,9 +392,9 @@
 
         return ResponseHelper.getResponse(
                 mapper(),
-                ResponseHelper.statusCode.NOT_IMPLEMENTED,
-                "Not Implemented",
-                "This request is not implemented"
+                ResponseHelper.statusCode.BAD_REQUEST,
+                "Bad Request",
+                "The command you specified is not implemented or doesn't exist."
         );
     }
 
@@ -420,24 +420,36 @@
     private Response handleRRMChange(RnibLink link, JsonNode rrmConf) throws InterruptedException {
         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() <= 3);
-        String poll = queue[0].poll(5, TimeUnit.SECONDS);
+        boolean isxICIC = link.getLinkId().getCell().getVersion() <= 3;
 
-        if (poll != null) {
+        queue[0] = get(XranController.class).sendModifiedRRMConf(link.getRrmParameters(),
+                isxICIC);
+
+        if (isxICIC) {
             return ResponseHelper.getResponse(
                     mapper(),
                     ResponseHelper.statusCode.OK,
-                    "RRMConfig Response",
-                    poll
+                    "OK",
+                    "xICIC was sent successfully"
             );
         } else {
-            return ResponseHelper.getResponse(
-                    mapper(),
-                    ResponseHelper.statusCode.REQUEST_TIMEOUT,
-                    "RRMConfig Timeout",
-                    "eNodeB did not send a RRMConfingStatus on time"
-            );
+            String poll = queue[0].poll(5, TimeUnit.SECONDS);
+
+            if (poll != null) {
+                return ResponseHelper.getResponse(
+                        mapper(),
+                        ResponseHelper.statusCode.OK,
+                        "RRMConfig Response",
+                        poll
+                );
+            } else {
+                return ResponseHelper.getResponse(
+                        mapper(),
+                        ResponseHelper.statusCode.REQUEST_TIMEOUT,
+                        "RRMConfig Timeout",
+                        "eNodeB did not send a RRMConfingStatus on time"
+                );
+            }
         }
     }
 }