commit 763fb7efe53ad8517bf5a24eae0e1ef9d7df145e
author Jonathan Hart <jono@onlab.us> Tue Sep 02 15:06:46 2014 -0700
committer Saurav Das <sauravdas@alumni.stanford.edu> Fri Sep 05 11:47:26 2014 -0700
tree fdbf6c5dcfbf9213d163fc955be9188e956f0f94
parent 8539994c16a109f8921156a7e4190e7eab49b57d

Wired up the match-action REST APIs to the MatchActionModule

Change-Id: Ifcbd27c83cac716435afb5f6869431d02500ce5b

src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java

diff --git a/src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java b/src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java
index 8255035..72fd717 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java
@@ -14,9 +14,11 @@
 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.ConflictDetectionPolicy;
 import net.onrc.onos.core.datagrid.IDatagridService;
 import net.onrc.onos.core.flowprogrammer.IFlowPusherService;
+import net.onrc.onos.core.matchaction.web.MatchActionWebRoutable;
 import net.onrc.onos.core.registry.IControllerRegistryService;
 import net.onrc.onos.core.util.IdGenerator;
 
@@ -57,6 +59,7 @@
         dependencies.add(IFlowPusherService.class);
         dependencies.add(IFloodlightProviderService.class);
         dependencies.add(IControllerRegistryService.class);
+        dependencies.add(IRestApiService.class);
         return dependencies;
     }
 
@@ -71,6 +74,9 @@
         final IFlowPusherService pusher = context.getServiceImpl(IFlowPusherService.class);
         final IFloodlightProviderService provider = context.getServiceImpl(IFloodlightProviderService.class);
         final IControllerRegistryService registry = context.getServiceImpl(IControllerRegistryService.class);
+        final IRestApiService restApi = context.getServiceImpl(IRestApiService.class);
+
+        restApi.addRestletRoutable(new MatchActionWebRoutable());
 
         matchActionComponent = new MatchActionComponent(datagrid, pusher, provider, registry);
         log.info("match action component created");

src/main/java/net/onrc/onos/core/matchaction/web/MatchActionResource.java

diff --git a/src/main/java/net/onrc/onos/core/matchaction/web/MatchActionResource.java b/src/main/java/net/onrc/onos/core/matchaction/web/MatchActionResource.java
index 037ee88..20e68d3 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/web/MatchActionResource.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/web/MatchActionResource.java
@@ -5,8 +5,8 @@
 
 import net.floodlightcontroller.restserver.CustomSerializerHelper;
 import net.onrc.onos.core.matchaction.MatchAction;
+import net.onrc.onos.core.matchaction.MatchActionFloodlightService;
 import net.onrc.onos.core.matchaction.MatchActionId;
-import net.onrc.onos.core.matchaction.MatchActionService;
 
 import org.codehaus.jackson.JsonGenerator;
 import org.codehaus.jackson.JsonProcessingException;
@@ -49,9 +49,9 @@
      */
     @Get("json")
     public Representation retrieve() {
-        MatchActionService matchActionService =
-                (MatchActionService) getContext().getAttributes()
-                    .get(MatchActionService.class.getCanonicalName());
+        MatchActionFloodlightService matchActionService =
+                (MatchActionFloodlightService) getContext().getAttributes()
+                    .get(MatchActionFloodlightService.class.getCanonicalName());
 
         Set<MatchAction> matchActions = matchActionService.getMatchActions();
 

src/main/java/net/onrc/onos/core/matchaction/web/MatchActionWebRoutable.java

diff --git a/src/main/java/net/onrc/onos/core/matchaction/web/MatchActionWebRoutable.java b/src/main/java/net/onrc/onos/core/matchaction/web/MatchActionWebRoutable.java
index 638b0ad..544f88e 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/web/MatchActionWebRoutable.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/web/MatchActionWebRoutable.java
@@ -13,7 +13,7 @@
 
     @Override
     public Restlet getRestlet(Context context) {
-        Router router = new Router();
+        Router router = new Router(context);
         router.attach("", MatchActionResource.class);
         return router;
     }