Update Forwarding to support specifying a default table ID for flow insertion....

Update Forwarding to support specifying a default table ID for flow insertion. It's flow table 0 by default, but it can be overridden using the net.floodlightcontroller.forwarding.Forwarding.table-id=X config parameter in floodlightdefault.properties. Set X to any table b/t 0 and the max.

src/main/java/net/floodlightcontroller/forwarding/Forwarding.java

@@ -59,6 +59,7 @@ import net.floodlightcontroller.util.OFDPAUtils;
 import net.floodlightcontroller.util.OFMessageUtils;
 import net.floodlightcontroller.util.OFPortMode;
 import net.floodlightcontroller.util.OFPortModeTuple;
+import net.floodlightcontroller.util.ParseUtils;
 
 import org.projectfloodlight.openflow.protocol.OFFlowMod;
 import org.projectfloodlight.openflow.protocol.OFFlowModCommand;
@@ -139,15 +140,18 @@ public class Forwarding extends ForwardingBase implements IFloodlightModule, IOF
 		OFFlowMod.Builder fmb = sw.getOFFactory().buildFlowAdd(); // this will be a drop-flow; a flow that will not output to any ports
 		List<OFAction> actions = new ArrayList<OFAction>(); // set no action to drop
 		U64 cookie = AppCookie.makeCookie(FORWARDING_APP_ID, 0);
-		log.info("Droppingggg");
+		log.info("Dropping");
 		fmb.setCookie(cookie)
 		.setHardTimeout(FLOWMOD_DEFAULT_HARD_TIMEOUT)
 		.setIdleTimeout(FLOWMOD_DEFAULT_IDLE_TIMEOUT)
-		.setBufferId(OFBufferId.NO_BUFFER)
+		.setBufferId(OFBufferId.NO_BUFFER) 
 		.setMatch(m)
 		.setPriority(FLOWMOD_DEFAULT_PRIORITY);
 
 		FlowModUtils.setActions(fmb, actions, sw);
+		
+        /* Configure for particular switch pipeline */
+        fmb.setTableId(FLOWMOD_DEFAULT_TABLE_ID);
 
 		try {
 			if (log.isDebugEnabled()) {
@@ -469,21 +473,28 @@ public class Forwarding extends ForwardingBase implements IFloodlightModule, IOF
 		Map<String, String> configParameters = context.getConfigParams(this);
 		String tmp = configParameters.get("hard-timeout");
 		if (tmp != null) {
-			FLOWMOD_DEFAULT_HARD_TIMEOUT = Integer.parseInt(tmp);
+			FLOWMOD_DEFAULT_HARD_TIMEOUT = ParseUtils.parseHexOrDecInt(tmp);
 			log.info("Default hard timeout set to {}.", FLOWMOD_DEFAULT_HARD_TIMEOUT);
 		} else {
 			log.info("Default hard timeout not configured. Using {}.", FLOWMOD_DEFAULT_HARD_TIMEOUT);
 		}
 		tmp = configParameters.get("idle-timeout");
 		if (tmp != null) {
-			FLOWMOD_DEFAULT_IDLE_TIMEOUT = Integer.parseInt(tmp);
+			FLOWMOD_DEFAULT_IDLE_TIMEOUT = ParseUtils.parseHexOrDecInt(tmp);
 			log.info("Default idle timeout set to {}.", FLOWMOD_DEFAULT_IDLE_TIMEOUT);
 		} else {
 			log.info("Default idle timeout not configured. Using {}.", FLOWMOD_DEFAULT_IDLE_TIMEOUT);
 		}
+		tmp = configParameters.get("table-id");
+        if (tmp != null) {
+            FLOWMOD_DEFAULT_TABLE_ID = TableId.of(ParseUtils.parseHexOrDecInt(tmp));
+            log.info("Default idle timeout set to {}.", FLOWMOD_DEFAULT_IDLE_TIMEOUT);
+        } else {
+            log.info("Default idle timeout not configured. Using {}.", FLOWMOD_DEFAULT_IDLE_TIMEOUT);
+        }
 		tmp = configParameters.get("priority");
 		if (tmp != null) {
-			FLOWMOD_DEFAULT_PRIORITY = 35777;
+			FLOWMOD_DEFAULT_PRIORITY = ParseUtils.parseHexOrDecInt(tmp);
 			log.info("Default priority set to {}.", FLOWMOD_DEFAULT_PRIORITY);
 		} else {
 			log.info("Default priority not configured. Using {}.", FLOWMOD_DEFAULT_PRIORITY);
@@ -491,7 +502,7 @@ public class Forwarding extends ForwardingBase implements IFloodlightModule, IOF
 		tmp = configParameters.get("set-send-flow-rem-flag");
 		if (tmp != null) {
 			FLOWMOD_DEFAULT_SET_SEND_FLOW_REM_FLAG = Boolean.parseBoolean(tmp);
-			log.info("Default flags will be set to SEND_FLOW_REM.");
+			log.info("Default flags will be set to SEND_FLOW_REM {}.", FLOWMOD_DEFAULT_SET_SEND_FLOW_REM_FLAG);
 		} else {
 			log.info("Default flags will be empty.");
 		}

src/main/java/net/floodlightcontroller/routing/ForwardingBase.java

@@ -64,6 +64,7 @@ import org.projectfloodlight.openflow.types.DatapathId;
 import org.projectfloodlight.openflow.types.MacAddress;
 import org.projectfloodlight.openflow.types.OFBufferId;
 import org.projectfloodlight.openflow.types.OFPort;
+import org.projectfloodlight.openflow.types.TableId;
 import org.projectfloodlight.openflow.types.U64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -82,6 +83,8 @@ public abstract class ForwardingBase implements IOFMessageListener {
 	public static int FLOWMOD_DEFAULT_IDLE_TIMEOUT = 5; // in seconds
 	public static int FLOWMOD_DEFAULT_HARD_TIMEOUT = 0; // infinite
 	public static int FLOWMOD_DEFAULT_PRIORITY = 1; // 0 is the default table-miss flow in OF1.3+, so we need to use 1
+	
+	public static TableId FLOWMOD_DEFAULT_TABLE_ID = TableId.ZERO;
 
 	protected static boolean FLOWMOD_DEFAULT_SET_SEND_FLOW_REM_FLAG = false;
 
@@ -260,6 +263,9 @@ public abstract class ForwardingBase implements IOFMessageListener {
 			.setPriority(FLOWMOD_DEFAULT_PRIORITY);
 
 			FlowModUtils.setActions(fmb, actions, sw);
+			
+			/* Configure for particular switch pipeline */
+			fmb.setTableId(FLOWMOD_DEFAULT_TABLE_ID);
 
 			try {
 				if (log.isTraceEnabled()) {