Merge "New features"

[groupbasedpolicy.git] / renderers / ofoverlay / src / main / java / org / opendaylight / groupbasedpolicy / renderer / ofoverlay / flow / OfTable.java

diff --git a/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/OfTable.java b/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/OfTable.java
old mode 100644 (file)
new mode 100755 (executable)
index e9d5255..7b599b1
--- a/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/OfTable.java
+++ b/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/OfTable.java
@@ -8,16 +8,9 @@
 
 package org.opendaylight.groupbasedpolicy.renderer.ofoverlay.flow;
 
-import java.util.concurrent.ScheduledExecutorService;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.groupbasedpolicy.renderer.ofoverlay.EndpointManager;
-import org.opendaylight.groupbasedpolicy.renderer.ofoverlay.PolicyManager;
-import org.opendaylight.groupbasedpolicy.renderer.ofoverlay.PolicyManager.Dirty;
-import org.opendaylight.groupbasedpolicy.renderer.ofoverlay.SwitchManager;
+import org.opendaylight.groupbasedpolicy.renderer.ofoverlay.OfWriter;
+import org.opendaylight.groupbasedpolicy.renderer.ofoverlay.OfContext;
 import org.opendaylight.groupbasedpolicy.resolver.PolicyInfo;
-import org.opendaylight.groupbasedpolicy.resolver.PolicyResolver;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,46 +25,13 @@ public abstract class OfTable {
     protected static final Logger LOG =
             LoggerFactory.getLogger(OfTable.class);
 
-    protected final OfTableCtx ctx;
+    protected final OfContext ctx;
 
-    public OfTable(OfTableCtx ctx) {
+    public OfTable(OfContext ctx) {
         super();
         this.ctx = ctx;
     }
 
-    /**
-     * The context needed for flow tables
-     */
-    public static class OfTableCtx {
-        protected final DataBroker dataBroker;
-        protected final RpcProviderRegistry rpcRegistry;
-    
-        protected final PolicyManager policyManager;
-        protected final SwitchManager switchManager;
-        protected final EndpointManager epManager;
-    
-        protected final PolicyResolver policyResolver;
-    
-        protected final ScheduledExecutorService executor;
-    
-        public OfTableCtx(DataBroker dataBroker,
-                          RpcProviderRegistry rpcRegistry,
-                          PolicyManager policyManager,
-                          PolicyResolver policyResolver,
-                          SwitchManager switchManager,
-                          EndpointManager endpointManager,
-                          ScheduledExecutorService executor) {
-            super();
-            this.dataBroker = dataBroker;
-            this.rpcRegistry = rpcRegistry;
-            this.policyManager = policyManager;
-            this.switchManager = switchManager;
-            this.epManager = endpointManager;
-            this.policyResolver = policyResolver;
-            this.executor = executor;
-        }
-    
-    }
 
     // *******
     // OfTable
@@ -80,10 +40,11 @@ public abstract class OfTable {
     /**
      * Update the relevant flow table for the node
      * @param nodeId the node to update
-     * @param dirty the dirty set
-     * @throws Exception
+     * @param policyInfo the current policy snapshot
+     * @param ofWriter the {@link OfWriter}
+     * @throws Exception throws all exception
      */
-    public abstract void update(NodeId nodeId, 
+    public abstract void update(NodeId nodeId,
                                 PolicyInfo policyInfo,
-                                Dirty dirty) throws Exception;
+                                OfWriter ofWriter) throws Exception;
 }