Update StaticFlowEntryPusher.java

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

@@ -132,17 +132,17 @@ implements IOFSwitchListener, IFloodlightModule, IStaticFlowEntryPusherService,
 	public static final String COLUMN_ARP_SPA = MatchUtils.STR_ARP_SPA;
 	public static final String COLUMN_ARP_DPA = MatchUtils.STR_ARP_DPA;
 	
-	//sanjivini
-		//IPv6 related columns
-		public static final String COLUMN_NW6_SRC = MatchUtils.STR_IPV6_SRC;
-		public static final String COLUMN_NW6_DST = MatchUtils.STR_IPV6_DST;
-		public static final String COLUMN_IPV6_FLOW_LABEL = MatchUtils.STR_IPV6_FLOW_LABEL;
-		public static final String COLUMN_ICMP6_TYPE = MatchUtils.STR_ICMPV6_TYPE;
-		public static final String COLUMN_ICMP6_CODE = MatchUtils.STR_ICMPV6_CODE;
-		public static final String COLUMN_ND_SLL = MatchUtils.STR_IPV6_ND_SSL;
-		public static final String COLUMN_ND_TLL = MatchUtils.STR_IPV6_ND_TTL;
-		public static final String COLUMN_ND_TARGET = MatchUtils.STR_IPV6_ND_TARGET;	
-	//sanjivini
+//sanjivini
+	//IPv6 related columns
+	public static final String COLUMN_NW6_SRC = MatchUtils.STR_IPV6_SRC;
+	public static final String COLUMN_NW6_DST = MatchUtils.STR_IPV6_DST;
+	public static final String COLUMN_IPV6_FLOW_LABEL = MatchUtils.STR_IPV6_FLOW_LABEL;
+	public static final String COLUMN_ICMP6_TYPE = MatchUtils.STR_ICMPV6_TYPE;
+	public static final String COLUMN_ICMP6_CODE = MatchUtils.STR_ICMPV6_CODE;
+	public static final String COLUMN_ND_SLL = MatchUtils.STR_IPV6_ND_SSL;
+	public static final String COLUMN_ND_TLL = MatchUtils.STR_IPV6_ND_TTL;
+	public static final String COLUMN_ND_TARGET = MatchUtils.STR_IPV6_ND_TARGET;	
+//sanjivini
 
 	public static final String COLUMN_MPLS_LABEL = MatchUtils.STR_MPLS_LABEL;
 	public static final String COLUMN_MPLS_TC = MatchUtils.STR_MPLS_TC;
@@ -177,11 +177,11 @@ implements IOFSwitchListener, IFloodlightModule, IStaticFlowEntryPusherService,
 		COLUMN_ARP_OPCODE, COLUMN_ARP_SHA, COLUMN_ARP_DHA, 
 		COLUMN_ARP_SPA, COLUMN_ARP_DPA,
 		
-		//sanjivini		
-				//IPv6 related matches
-				COLUMN_NW6_SRC, COLUMN_NW6_DST, COLUMN_ICMP6_TYPE, COLUMN_ICMP6_CODE, 
-				COLUMN_IPV6_FLOW_LABEL, COLUMN_ND_SLL, COLUMN_ND_TLL, COLUMN_ND_TARGET,
-		//sanjivini		
+//sanjivini		
+		//IPv6 related matches
+		COLUMN_NW6_SRC, COLUMN_NW6_DST, COLUMN_ICMP6_TYPE, COLUMN_ICMP6_CODE, 
+		COLUMN_IPV6_FLOW_LABEL, COLUMN_ND_SLL, COLUMN_ND_TLL, COLUMN_ND_TARGET,
+//sanjivini		
 		
 		COLUMN_MPLS_LABEL, COLUMN_MPLS_TC, COLUMN_MPLS_BOS, 
 		COLUMN_METADATA, COLUMN_TUNNEL_ID, COLUMN_PBB_ISID,
@@ -346,8 +346,6 @@ implements IOFSwitchListener, IFloodlightModule, IStaticFlowEntryPusherService,
 
 		StringBuffer matchString = new StringBuffer();
 		OFFlowMod.Builder fmb = null; 
-		
-		//boolean flow = true;
 
 		if (!row.containsKey(COLUMN_SWITCH) || !row.containsKey(COLUMN_NAME)) {
 			log.debug("skipping entry with missing required 'switch' or 'name' entry: {}", row);
@@ -424,25 +422,11 @@ implements IOFSwitchListener, IFloodlightModule, IStaticFlowEntryPusherService,
 		String match = matchString.toString();
 
 		try {
-			//Match matchObt = MatchUtils.fromString(match, fmb.getVersion());
-			//Iterable <MatchField<?>> iter = matchObt.getMatchFields();					
-			
-			//while (iter.iterator().hasNext()) {
-			//	MatchField<?> field = iter.iterator().next();
-//System.out.println("$$$$$$$$$$$$$San FIELD :" + field);				
-	//			flow = field.arePrerequisitesOK(matchObt);
-	//			if (flow == false)
-	//				break;
-	//		}
-	//		if (flow == false) {
-	//			log.debug("Flow entry discarded with illegal OFMatch(): " + match);
-	//			return;
-	//		}				
 			fmb.setMatch(MatchUtils.fromString(match, fmb.getVersion()));
 		} catch (IllegalArgumentException e) {
 			log.debug("ignoring flow entry {} on switch {} with illegal OFMatch() key: " + match, entryName, switchName);
 			return;
-		} 
+		}
 //sanjivini		
 		catch (Exception e) {
 			log.error("OF version incompatible for the match: " + match);