Merge "Adding synchronous behaviour to the calendar REST API to wait until inten…

…t is in parked state. Needs testing."

Merge "Adding synchronous behaviour to the calendar REST API to wait until inten…
…t is in parked state. Needs testing."
Thomas Vachuska · Gerrit Code Review
Commit ecd89261be4ba6f30ff43f7b95aa63c3f32d66fe ecd89261 2 parents 61d04049 56d1a700
Showing 1 changed file with 68 additions and 8 deletions
apps/calendar/src/main/java/org/onlab/onos/calendar/BandwidthCalendarResource.java
--- a/apps/calendar/src/main/java/org/onlab/onos/calendar/BandwidthCalendarResource.java
View file @ecd8926
+++ b/apps/calendar/src/main/java/org/onlab/onos/calendar/BandwidthCalendarResource.java
View file @ecd8926
@@ -16,14 +16,24 @@
 package org.onlab.onos.calendar;
 import java.net.URI;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 import org.onlab.onos.net.ConnectPoint;
 import org.onlab.onos.net.DeviceId;
+import org.onlab.onos.net.intent.Intent;
+import org.onlab.onos.net.intent.IntentEvent;
+import org.onlab.onos.net.intent.IntentId;
+import org.onlab.onos.net.intent.IntentListener;
 import org.onlab.onos.net.intent.IntentService;
+import org.onlab.onos.net.intent.IntentState;
 import org.onlab.rest.BaseResource;
+
 import javax.ws.rs.POST;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.core.Response;
+
 import org.onlab.onos.core.ApplicationId;
 import org.onlab.onos.core.CoreService;
 import org.onlab.onos.net.flow.DefaultTrafficSelector;
@@ -31,10 +41,15 @@ import org.onlab.onos.net.flow.TrafficSelector;
 import org.onlab.onos.net.flow.TrafficTreatment;
 import org.onlab.onos.net.intent.PointToPointIntent;
 import org.onlab.packet.Ethernet;
+
 import static org.onlab.onos.net.PortNumber.portNumber;
 import static org.onlab.onos.net.flow.DefaultTrafficTreatment.builder;
+import static org.onlab.onos.net.intent.IntentState.FAILED;
+import static org.onlab.onos.net.intent.IntentState.INSTALLED;
+import static org.onlab.onos.net.intent.IntentState.WITHDRAWN;
 import static org.slf4j.LoggerFactory.getLogger;
+
 import org.slf4j.Logger;
 /**
@@ -44,6 +59,7 @@ import org.slf4j.Logger;
 public class BandwidthCalendarResource extends BaseResource {
     private static final Logger log = getLogger(BandwidthCalendarResource.class);
+    private static final long TIMEOUT = 5; // seconds
     @javax.ws.rs.Path("/{src}/{dst}/{srcPort}/{dstPort}/{bandwidth}")
     @POST
@@ -68,24 +84,38 @@ public class BandwidthCalendarResource extends BaseResource {
         PointToPointIntent intentP2P =
                 new PointToPointIntent(appId(), selector, treatment,
                                        srcPoint, dstPoint);
-        service.submit(intentP2P);
-        log.info("Submitted Calendar App intent: src = " + src + "dest = " + dst
-                + "srcPort = " + srcPort + "destPort" + dstPort + "intentID = " + intentP2P.id().toString());
-        String reply =  intentP2P.id().toString() + "\n";
+        CountDownLatch latch = new CountDownLatch(1);
+        InternalIntentListener listener = new InternalIntentListener(intentP2P, service, latch);
+        service.addListener(listener);
+        service.submit(intentP2P);
+        try {
+            if (latch.await(TIMEOUT, TimeUnit.SECONDS)) {
+                log.info("Submitted Calendar App intent: src = {}; dst = {}; " +
+                                 "srcPort = {}; dstPort = {}; intentID = {}",
+                         src, dst, srcPort, dstPort, intentP2P.id());
+                String reply = intentP2P.id() + " " + listener.getState() + "\n";
                 return Response.ok(reply).build();
             }
+        } catch (InterruptedException e) {
+            log.warn("Interrupted while waiting for intent {} status", intentP2P.id());
+        }
+        return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+    }
     @javax.ws.rs.Path("/cancellation/{intentId}")
     @DELETE
     public Response withdrawIntent(@PathParam("intentId") String intentId) {
-
+        log.info("Receiving Teardown request for {}", intentId);
-        log.info("Receiving Teardown request...");
+        IntentService service = get(IntentService.class);
-        log.info("Withdraw intentId = {} ", intentId);
+        Intent intent = service.getIntent(IntentId.valueOf(Long.parseLong(intentId)));
-
+        if (intent != null) {
+            service.withdraw(intent);
             String reply = "ok\n";
             return Response.ok(reply).build();
         }
+        return Response.status(Response.Status.NOT_FOUND).build();
+    }
     @javax.ws.rs.Path("/modification/{intentId}/{bandwidth}")
     @POST
@@ -115,4 +145,34 @@ public class BandwidthCalendarResource extends BaseResource {
     protected ApplicationId appId() {
         return get(CoreService.class).registerApplication("org.onlab.onos.calendar");
     }
+
+    // Auxiliary listener to wait until the given intent reaches the installed or failed states.
+    private final class InternalIntentListener implements IntentListener {
+        private final Intent intent;
+        private final IntentService service;
+        private final CountDownLatch latch;
+        private IntentState state;
+
+        private InternalIntentListener(Intent intent, IntentService service,
+                                       CountDownLatch latch) {
+            this.intent = intent;
+            this.service = service;
+            this.latch = latch;
+        }
+
+        @Override
+        public void event(IntentEvent event) {
+            if (event.subject().equals(intent)) {
+                state = service.getIntentState(intent.id());
+                if (state == INSTALLED || state == FAILED || state == WITHDRAWN) {
+                    latch.countDown();
+                }
+                service.removeListener(this);
+            }
+        }
+
+        public IntentState getState() {
+            return state;
+        }
+    }
 }