commit 68e8dd66617f5f145b4d388b163ac4052b88b3d8
author Jonathan Hart <jono@onlab.us> Tue Aug 26 18:06:23 2014 -0700
committer Saurav Das <sauravdas@alumni.stanford.edu> Fri Sep 05 11:47:25 2014 -0700
tree 5452f476b73f2b0a7a5585789b7740c419e1d108
parent b0d8624f62b1f4e0c44991e255a9bdfbf0c5a250

Hook up the Intent and Flow REST APIs to the modules/services.

This involved some slight changes to the way the intent service is registered
with the Floodlight module framework. Also FlowManagerModule is now registered
in the services file.

Change-Id: I6a97599e625c385a07996e03236fe94af4705650

src/main/java/net/onrc/onos/core/newintent/IntentFloodlightModule.java

diff --git a/src/main/java/net/onrc/onos/core/newintent/IntentFloodlightModule.java b/src/main/java/net/onrc/onos/core/newintent/IntentFloodlightModule.java
index cf0e5e5..3ac9882 100644
--- a/src/main/java/net/onrc/onos/core/newintent/IntentFloodlightModule.java
+++ b/src/main/java/net/onrc/onos/core/newintent/IntentFloodlightModule.java
@@ -1,9 +1,17 @@
 package net.onrc.onos.core.newintent;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
 import net.floodlightcontroller.core.module.FloodlightModuleContext;
 import net.floodlightcontroller.core.module.FloodlightModuleException;
 import net.floodlightcontroller.core.module.IFloodlightModule;
 import net.floodlightcontroller.core.module.IFloodlightService;
+import net.floodlightcontroller.restserver.IRestApiService;
 import net.onrc.onos.api.flowmanager.FlowId;
 import net.onrc.onos.api.flowmanager.FlowManagerFloodlightService;
 import net.onrc.onos.api.flowmanager.FlowManagerService;
@@ -21,18 +29,12 @@
 import net.onrc.onos.api.newintent.PathIntent;
 import net.onrc.onos.api.newintent.PointToPointIntent;
 import net.onrc.onos.core.datagrid.ISharedCollectionsService;
+import net.onrc.onos.core.newintent.web.IntentWebRoutable;
 import net.onrc.onos.core.registry.IControllerRegistryService;
 import net.onrc.onos.core.topology.ITopologyService;
 import net.onrc.onos.core.util.IdBlockAllocator;
 import net.onrc.onos.core.util.IdGenerator;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * A Floodlight module for Intent Service.
  */
@@ -49,7 +51,7 @@
     @Override
     public Map<Class<? extends IFloodlightService>, IFloodlightService> getServiceImpls() {
         Map<Class<? extends IFloodlightService>, IFloodlightService> impls = new HashMap<>();
-        impls.put(IFloodlightService.class, this);
+        impls.put(IntentFloodlightService.class, this);
         return impls;
     }
 
@@ -88,6 +90,9 @@
 
         registerDefaultCompilers(intentIdGenerator, flowIdGenerator, topologyService);
         registerDefaultInstallers(flowManagerService);
+
+        IRestApiService restApi = context.getServiceImpl(IRestApiService.class);
+        restApi.addRestletRoutable(new IntentWebRoutable());
     }
 
     private void registerDefaultCompilers(IdGenerator<IntentId> intentIdGenerator,