Code Review
/
openflowplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-837: it unstable (timeout to 60s)
[openflowplugin.git]
/
openflowplugin-it
/
src
/
test
/
java
/
org
/
opendaylight
/
openflowplugin
/
openflow
/
md
/
it
/
OFPluginToLibraryTest.java
diff --git
a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginToLibraryTest.java
b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginToLibraryTest.java
index 1415ed2bb97bfd3a9beaa443e999e67ecc076715..a565e7a4fc8e9622721d8c4edd65a5ef490b45a8 100644
(file)
--- a/
openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginToLibraryTest.java
+++ b/
openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPluginToLibraryTest.java
@@
-49,10
+49,10
@@
public class OFPluginToLibraryTest {
private final ArrayBlockingQueue<Runnable> SCENARIO_POOL_QUEUE = new ArrayBlockingQueue<>(1);
private final ArrayBlockingQueue<Runnable> SCENARIO_POOL_QUEUE = new ArrayBlockingQueue<>(1);
- @Inject @Filter(timeout=
2
0000)
+ @Inject @Filter(timeout=
6
0000)
OpenflowPluginProvider openflowPluginProvider;
OpenflowPluginProvider openflowPluginProvider;
- @Inject
+ @Inject
@Filter(timeout=60000)
BundleContext ctx;
private SimpleClient switchSim;
BundleContext ctx;
private SimpleClient switchSim;
@@
-88,7
+88,7
@@
public class OFPluginToLibraryTest {
switchSim.setSecuredClient(false);
Deque<ClientEvent> handshakeScenario = ScenarioFactory.createHandshakeScenarioVBM(
switchSim.setSecuredClient(false);
Deque<ClientEvent> handshakeScenario = ScenarioFactory.createHandshakeScenarioVBM(
- ScenarioFactory.VERSION_BITMAP_13, (short) 0, ScenarioFactory.VERSION_BITMAP_10_13);
+ ScenarioFactory.VERSION_BITMAP_13, (short) 0, ScenarioFactory.VERSION_BITMAP_10_13
, true
);
ScenarioHandler scenario = new ScenarioHandler(handshakeScenario);
switchSim.setScenarioHandler(scenario);
ScenarioHandler scenario = new ScenarioHandler(handshakeScenario);
switchSim.setScenarioHandler(scenario);
@@
-234,7
+234,6
@@
public class OFPluginToLibraryTest {
TestHelper.mdSalCoreBundles(),
TestHelper.configMinumumBundles(),
TestHelper.baseModelBundles(),
TestHelper.mdSalCoreBundles(),
TestHelper.configMinumumBundles(),
TestHelper.baseModelBundles(),
- TestHelper.flowCapableModelBundles(),
OFPaxOptionsAssistant.ofPluginBundles());
}
OFPaxOptionsAssistant.ofPluginBundles());
}