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 1b448dd..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,18 +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.OfWriter;
 import org.opendaylight.groupbasedpolicy.renderer.ofoverlay.OfContext;
-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.resolver.PolicyInfo;
-import org.opendaylight.groupbasedpolicy.resolver.PolicyResolver;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,27 +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;
-    
-    // ***************
-    // Utility methods
-    // ***************
-
-    /**
-     * Parse an OF port number from a node connector ID
-     * @param id the ID
-     * @return the port number
-     */
-    protected static long getOfPortNum(NodeConnectorId id) {
-        String cnid = id.getValue();
-        int ci = cnid.lastIndexOf(':');
-        if (ci < 0 || (ci+1 >= cnid.length()))
-            throw new NumberFormatException("Invalid node connector ID " + cnid);
-        return Long.parseLong(cnid.substring(ci+1));
-    }
+                                OfWriter ofWriter) throws Exception;
 }