Commit f20389083186312714685ab6c19defa21fac6953
1 parent
24896eab
wildcard changes
Showing
1 changed file
with
11 additions
and
11 deletions
src/main/java/net/floodlightcontroller/pelstats/PELStats.java
| ... | ... | @@ -167,12 +167,12 @@ public class PELStats implements IFloodlightModule, IOFMessageListener, RestAPIP |
| 167 | 167 | if (!portsCalls.contains(new Integer(port))){ //if the call isn't already assigned to a queue and we want to add new calls to queue |
| 168 | 168 | System.out.println("@PELStats: \tport add: "+port); |
| 169 | 169 | sendOFFlowMod(sw,port); |
| 170 | + } | |
| 171 | + //Updating the ports calls map | |
| 172 | + portsCalls.add(port); | |
| 173 | + portsCallsMap.put(sw, portsCalls); | |
| 170 | 174 | |
| 171 | - //Updating the ports calls map | |
| 172 | - portsCalls.add(port); | |
| 173 | - portsCallsMap.put(sw, portsCalls); | |
| 174 | - | |
| 175 | - } | |
| 175 | + | |
| 176 | 176 | } |
| 177 | 177 | else{ |
| 178 | 178 | System.out.println("@PELStats \tportsCalls==null"); |
| ... | ... | @@ -259,17 +259,17 @@ public class PELStats implements IFloodlightModule, IOFMessageListener, RestAPIP |
| 259 | 259 | OFmessage.setCookie(0); |
| 260 | 260 | OFmessage.setIdleTimeout((short) 0); |
| 261 | 261 | OFmessage.setHardTimeout((short)0); |
| 262 | - OFmessage.setPriority((short)queueInfos.get(sw).get(1).shortValue()); | |
| 262 | + OFmessage.setPriority((short)0);//queueInfos.get(sw).get(1).shortValue()); | |
| 263 | 263 | OFmessage.setBufferId(0); |
| 264 | 264 | OFmessage.setOutPort((short)0xffff); |
| 265 | 265 | OFmessage.setFlags((short) 0); |
| 266 | 266 | |
| 267 | - OFmatch.setTransportDestination((short)port); | |
| 267 | + //OFmatch.setTransportDestination((short)port); | |
| 268 | 268 | OFmatch.setTransportSource((short)port); |
| 269 | 269 | |
| 270 | 270 | |
| 271 | 271 | OFmatch.setWildcards(OFMatch.OFPFW_ALL - OFMatch.OFPFW_IN_PORT |
| 272 | - - OFMatch.OFPFW_TP_SRC - OFmatch.OFPFW_TP_DST ); | |
| 272 | + - OFMatch.OFPFW_TP_SRC); | |
| 273 | 273 | OFmatch.setInputPort((short)1); |
| 274 | 274 | OFmessage.setMatch(OFmatch); |
| 275 | 275 | |
| ... | ... | @@ -297,17 +297,17 @@ public class PELStats implements IFloodlightModule, IOFMessageListener, RestAPIP |
| 297 | 297 | OFmessage.setCookie(0); |
| 298 | 298 | OFmessage.setIdleTimeout((short) 0); |
| 299 | 299 | OFmessage.setHardTimeout((short)0); |
| 300 | - OFmessage.setPriority((short)queueInfos.get(sw).get(1).shortValue()); | |
| 300 | + OFmessage.setPriority((short)0); | |
| 301 | 301 | OFmessage.setBufferId(0); |
| 302 | 302 | OFmessage.setOutPort((short)0xffff); |
| 303 | 303 | OFmessage.setFlags((short) 0); |
| 304 | 304 | |
| 305 | - OFmatch.setTransportDestination((short)port); | |
| 305 | + //OFmatch.setTransportDestination((short)port); | |
| 306 | 306 | OFmatch.setTransportSource((short)port); |
| 307 | 307 | |
| 308 | 308 | |
| 309 | 309 | OFmatch.setWildcards(OFMatch.OFPFW_ALL - OFMatch.OFPFW_IN_PORT |
| 310 | - - OFMatch.OFPFW_TP_SRC - OFmatch.OFPFW_TP_DST ); | |
| 310 | + - OFMatch.OFPFW_TP_SRC); | |
| 311 | 311 | OFmatch.setInputPort((short)2); |
| 312 | 312 | OFmessage.setMatch(OFmatch); |
| 313 | 313 | ... | ... |