Skip to content
Snippets Groups Projects
Commit 82dbaf26 authored by meiyangbigswitch's avatar meiyangbigswitch
Browse files

Merge branch 'master' of github.com:meiyangbigswitch/bigswitchcontroller

Conflicts:
	floodlight/src/test/java/net/floodlightcontroller/flowcache/FlowReconcileMgrTest.java
parents 31179559 ce250cc4
No related branches found
No related tags found
No related merge requests found
...@@ -33,7 +33,7 @@ import net.floodlightcontroller.flowcache.OFMatchReconcile; ...@@ -33,7 +33,7 @@ import net.floodlightcontroller.flowcache.OFMatchReconcile;
import net.floodlightcontroller.flowcache.PriorityPendingQueue.EventPriority; import net.floodlightcontroller.flowcache.PriorityPendingQueue.EventPriority;
import net.floodlightcontroller.test.FloodlightTestCase; import net.floodlightcontroller.test.FloodlightTestCase;
import net.floodlightcontroller.threadpool.IThreadPoolService; import net.floodlightcontroller.threadpool.IThreadPoolService;
import net.floodlightcontroller.flowcache.PriorityPendingQueue.EventPriority;
import org.easymock.EasyMock; import org.easymock.EasyMock;
import org.easymock.IAnswer; import org.easymock.IAnswer;
import org.junit.Before; import org.junit.Before;
...@@ -432,7 +432,7 @@ public class FlowReconcileMgrTest extends FloodlightTestCase { ...@@ -432,7 +432,7 @@ public class FlowReconcileMgrTest extends FloodlightTestCase {
int index = 0; int index = 0;
for (index = 0; index < 10; index++) { for (index = 0; index < 10; index++) {
ofmRcIn.cookie = index; ofmRcIn.cookie = index;
flowReconcileMgr.reconcileFlow(ofmRcIn,EventPriority.EVENT_MEDIUM); flowReconcileMgr.reconcileFlow(ofmRcIn,EventPriority.EVENT_HIGH);
} }
flowReconcileMgr.flowReconcileEnabled = true; flowReconcileMgr.flowReconcileEnabled = true;
flowReconcileMgr.doReconcile(); flowReconcileMgr.doReconcile();
...@@ -508,7 +508,7 @@ public class FlowReconcileMgrTest extends FloodlightTestCase { ...@@ -508,7 +508,7 @@ public class FlowReconcileMgrTest extends FloodlightTestCase {
OFMatchReconcile ofmRc = new OFMatchReconcile(); OFMatchReconcile ofmRc = new OFMatchReconcile();
// push large number of flows to be reconciled. // push large number of flows to be reconciled.
for (int i = 0; i < NUM_FLOWS_PER_THREAD; i++) { for (int i = 0; i < NUM_FLOWS_PER_THREAD; i++) {
flowReconcileMgr.reconcileFlow(ofmRc, EventPriority.EVENT_LOW); flowReconcileMgr.reconcileFlow(ofmRc,EventPriority.EVENT_HIGH);
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment