Added MPLS_BOS and TUNNEL_ID support to SFP, since Loxi now supports it. Also...

Added MPLS_BOS and TUNNEL_ID support to SFP, since Loxi now supports it. Also changed MatchUtils's fromString() function's header to include the updated syntax for fields.

src/main/java/net/floodlightcontroller/staticflowentry/StaticFlowEntries.java

@@ -277,12 +277,16 @@ public class StaticFlowEntries {
 			case MPLS_TC:
 				entry.put(StaticFlowEntryPusher.COLUMN_MPLS_TC, match.get(MatchField.MPLS_TC).getValue());
 				break;
-				// case MPLS_BOS not implemented in loxi
+			case MPLS_BOS:
+				entry.put(StaticFlowEntryPusher.COLUMN_MPLS_BOS, match.get(MatchField.MPLS_BOS).getValue());
+				break;			
 			case METADATA:
 				entry.put(StaticFlowEntryPusher.COLUMN_METADATA, match.get(MatchField.METADATA).getValue().getValue());
 				break;
-				// case TUNNEL_ID not implemented in loxi
-				// case PBB_ISID not implemented in loxi
+			case TUNNEL_ID:
+				entry.put(StaticFlowEntryPusher.COLUMN_TUNNEL_ID, match.get(MatchField.TUNNEL_ID).getValue());
+				break;				
+			// case PBB_ISID not implemented in loxi
 			default:
 				log.error("Unhandled Match when parsing OFFlowMod: {}, {}", mf, mf.id);
 				break;

src/main/java/net/floodlightcontroller/util/MatchUtils.java

@@ -298,23 +298,23 @@ public class MatchUtils {
 	 * <TD>VALUE
 	 * </TR>
 	 * <TR>
-	 * <TD>"in_port","input_port"
+	 * <TD>"in_port"
 	 * <TD>integer
 	 * </TR>
 	 * <TR>
-	 * <TD>"dl_src", "dl_dst"
+	 * <TD>"eth_src", "eth_dst"
 	 * <TD>hex-string
 	 * </TR>
 	 * <TR>
-	 * <TD>"dl_type", "dl_vlan", "dl_vlan_pcp"
+	 * <TD>"eth_type", "eth_vlan_vid", "eth_vlan_pcp"
 	 * <TD>integer
 	 * </TR>
 	 * <TR>
-	 * <TD>"nw_src", "nw_dst"
+	 * <TD>"ipv4_src", "ipv4_dst"
 	 * <TD>CIDR-style netmask
 	 * </TR>
 	 * <TR>
-	 * <TD>"tp_src","tp_dst"
+	 * <TD>"tp_src","tp_dst", "tcp_src", "tcp_dst", "udp_src", "udp_dst", etc.
 	 * <TD>integer (max 64k)
 	 * </TR>
 	 * </TABLE>