From b7d5355cfc3538bab633f3f5f01c1977bb4f136a Mon Sep 17 00:00:00 2001
From: Tulio Ribeiro <worm@TAR>
Date: Fri, 25 Mar 2016 14:43:11 +0000
Subject: [PATCH] There something strange, JUnit tests from Eclipse it is ok!
But from ant file there is some errors.
If I run this test lonely in Eclipse with JUnit, it is ok.
[junit] Running org.sdnplatform.sync.internal.store.RemoteStoreTest
[junit] Tests run: 8, Failures: 0, Errors: 7, Skipped: 0, Time elapsed: 13,244 sec
[junit] Running org.sdnplatform.sync.internal.SyncManagerTest
[junit] Tests run: 13, Failures: 8, Errors: 0, Skipped: 3, Time elapsed: 15,847 sec
TESTS RESULT:
worm@TAR:~/ForkFloodlight/floodlight$ ant tests
Buildfile: /home/worm/ForkFloodlight/floodlight/build.xml
init:
compile:
[javac] Compiling 1 source file to /home/worm/ForkFloodlight/floodlight/target/bin
[javac] warning: [options] bootstrap class path not set in conjunction with -source 1.7
[javac] 1 warning
compile-test:
test:
[junit] Running net.floodlightcontroller.accesscontrollist.ACLRuleResourceTest
[junit] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,517 sec
[junit] Running net.floodlightcontroller.accesscontrollist.ACLRuleTest
[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,003 sec
[junit] Running net.floodlightcontroller.accesscontrollist.ACLTest
[junit] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,29 sec
[junit] Running net.floodlightcontroller.accesscontrollist.APManagerTest
[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,004 sec
[junit] Running net.floodlightcontroller.accesscontrollist.IPAddressUtilTest
[junit] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,005 sec
[junit] Running net.floodlightcontroller.core.internal.ControllerTest
[junit] Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,382 sec
[junit] Running net.floodlightcontroller.core.internal.OFChannelHandlerVer10Test
[junit] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,148 sec
[junit] Running net.floodlightcontroller.core.internal.OFChannelHandlerVer13Test
[junit] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,055 sec
[junit] Running net.floodlightcontroller.core.internal.OFConnectionTest
[junit] Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,078 sec
[junit] Running net.floodlightcontroller.core.internal.OFSwitchBaseTest
[junit] Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,055 sec
[junit] Running net.floodlightcontroller.core.internal.OFSwitchHandshakeHandlerVer10Test
[junit] Tests run: 27, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,276 sec
[junit] Running net.floodlightcontroller.core.internal.OFSwitchHandshakeHandlerVer13Test
[junit] Tests run: 29, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,214 sec
[junit] Running net.floodlightcontroller.core.internal.OFSwitchManagerTest
[junit] Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,165 sec
[junit] Running net.floodlightcontroller.core.internal.OFSwitchTest
[junit] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,017 sec
[junit] Running net.floodlightcontroller.core.internal.RoleManagerTest
[junit] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,037 sec
[junit] Running net.floodlightcontroller.core.util.AppCookieTest
[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,001 sec
[junit] Running net.floodlightcontroller.core.util.MessageDispatcherTest
[junit] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,158 sec
[junit] Running net.floodlightcontroller.core.util.SingletonTaskTest
[junit] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,589 sec
[junit] Running net.floodlightcontroller.debugcounter.DebugCounterImplTest
[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,001 sec
[junit] Running net.floodlightcontroller.debugcounter.DebugCounterServiceTest
[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,009 sec
[junit] Running net.floodlightcontroller.debugcounter.OFConnectionCountersTest
[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,078 sec
[junit] Running net.floodlightcontroller.debugevent.DebugEventTest
[junit] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,014 sec
[junit] Running net.floodlightcontroller.debugevent.EventTest
[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,004 sec
[junit] Running net.floodlightcontroller.devicemanager.internal.DeviceManagerImplTest
[junit] Tests run: 37, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,477 sec
[junit] Running net.floodlightcontroller.devicemanager.internal.DeviceUniqueIndexTest
[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,002 sec
[junit] Running net.floodlightcontroller.firewall.FirewallTest
[junit] Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,073 sec
[junit] Running net.floodlightcontroller.forwarding.ForwardingTest
[junit] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,075 sec
[junit] Running net.floodlightcontroller.hub.HubTest
[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,006 sec
[junit] Running net.floodlightcontroller.learningswitch.LearningSwitchTest
[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,016 sec
[junit] Running net.floodlightcontroller.linkdiscovery.internal.LinkDiscoveryManagerTest
[junit] Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,394 sec
[junit] Running net.floodlightcontroller.loadbalancer.LoadBalancerTest
[junit] Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,044 sec
[junit] Running net.floodlightcontroller.notification.NotificationTest
[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,001 sec
[junit] Running net.floodlightcontroller.packet.BSNTest
[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,002 sec
[junit] Running net.floodlightcontroller.packet.DHCPTest
[junit] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,005 sec
[junit] Running net.floodlightcontroller.packet.EthernetTest
[junit] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,001 sec
[junit] Running net.floodlightcontroller.packet.ICMPTest
[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,002 sec
[junit] Running net.floodlightcontroller.packet.IPv4Test
[junit] Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,004 sec
[junit] Running net.floodlightcontroller.packet.IPv6Test
[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,003 sec
[junit] Running net.floodlightcontroller.packet.LLDPOrganizationalTLVTest
[junit] Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,012 sec
[junit] Running net.floodlightcontroller.packet.LLDPTest
[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,002 sec
[junit] Running net.floodlightcontroller.packet.PacketTest
[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,005 sec
[junit] Running net.floodlightcontroller.packet.SPUDTest
[junit] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,002 sec
[junit] Running net.floodlightcontroller.packet.TCPTest
[junit] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,002 sec
[junit] Running net.floodlightcontroller.packet.UDPTest
[junit] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,005 sec
[junit] Running net.floodlightcontroller.routing.RouteTest
[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,005 sec
[junit] Running net.floodlightcontroller.staticflowentry.StaticFlowTests
[junit] Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0,008 sec
[junit] TEST net.floodlightcontroller.staticflowentry.StaticFlowTests FAILED
[junit] Running net.floodlightcontroller.storage.memory.tests.MemoryStorageTest
[junit] Tests run: 29, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,053 sec
[junit] Running net.floodlightcontroller.topology.TopologyInstanceTest
[junit] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,029 sec
[junit] Running net.floodlightcontroller.topology.TopologyManagerTest
[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,002 sec
[junit] Running net.floodlightcontroller.util.EnumBitmapsTest
[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,003 sec
[junit] Running net.floodlightcontroller.util.OFMessageDamperTest
[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,124 sec
[junit] Running net.floodlightcontroller.util.TimedCacheTest
[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,069 sec
[junit] Running net.floodlightcontroller.virtualnetwork.VirtualNetworkFilterTest
[junit] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,072 sec
[junit] Running org.sdnplatform.sync.VersionedTest
[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,002 sec
[junit] Running org.sdnplatform.sync.client.ClientTest
[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,951 sec
[junit] Running org.sdnplatform.sync.internal.BootstrapTest
[junit] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 50,547 sec
[junit] Running org.sdnplatform.sync.internal.SyncManagerTest
[junit] Tests run: 13, Failures: 8, Errors: 0, Skipped: 3, Time elapsed: 15,847 sec
[junit] TEST org.sdnplatform.sync.internal.SyncManagerTest FAILED
[junit] Running org.sdnplatform.sync.internal.store.InMemoryStorageEngineTest
[junit] Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,514 sec
[junit] Running org.sdnplatform.sync.internal.store.JacksonStoreTest
[junit] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,057 sec
[junit] Running org.sdnplatform.sync.internal.store.JavaDBStorageEngineTest
[junit] Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1,578 sec
[junit] Running org.sdnplatform.sync.internal.store.RemoteStoreTest
[junit] Tests run: 8, Failures: 0, Errors: 7, Skipped: 0, Time elapsed: 13,244 sec
[junit] TEST org.sdnplatform.sync.internal.store.RemoteStoreTest FAILED
[junit] Running org.sdnplatform.sync.internal.version.ClockEntryTest
[junit] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,001 sec
[junit] Running org.sdnplatform.sync.internal.version.VectorClockInconsistencyResolverTest
[junit] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,003 sec
[junit] Running org.sdnplatform.sync.internal.version.VectorClockTest
[junit] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0,013 sec
[junit] Tests FAILED
BUILD FAILED
/home/worm/ForkFloodlight/floodlight/build.xml:223: Unit test(s) failed. See reports!
---
.../core/internal/OFSwitchHandshakeHandler.java | 9 +++++----
.../core/internal/OFSwitchManager.java | 7 -------
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/core/internal/OFSwitchHandshakeHandler.java b/src/main/java/net/floodlightcontroller/core/internal/OFSwitchHandshakeHandler.java
index 561ff3ff2..aa9322d64 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/OFSwitchHandshakeHandler.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/OFSwitchHandshakeHandler.java
@@ -1332,10 +1332,11 @@ public class OFSwitchHandshakeHandler implements IOFConnectionListener {
* If not defined there, the role will be set as MASTER
*/
OFControllerRole role = OFControllerRole.ROLE_MASTER;
- if(OFSwitchManager.switchInitialRole.containsKey(mainConnection.getDatapathId())){
- role = OFSwitchManager.switchInitialRole.get(mainConnection.getDatapathId());
- log.info("Defining switch role from config file: {}", role);
- }
+ if(OFSwitchManager.switchInitialRole != null)
+ if(OFSwitchManager.switchInitialRole.containsKey(mainConnection.getDatapathId())){
+ role = OFSwitchManager.switchInitialRole.get(mainConnection.getDatapathId());
+ log.info("Defining switch role from config file: {}", role);
+ }
sendRoleRequest(role);
}
}
diff --git a/src/main/java/net/floodlightcontroller/core/internal/OFSwitchManager.java b/src/main/java/net/floodlightcontroller/core/internal/OFSwitchManager.java
index 530be7059..1450bc316 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/OFSwitchManager.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/OFSwitchManager.java
@@ -118,9 +118,6 @@ public class OFSwitchManager implements IOFSwitchManager, INewOFConnectionListen
private ConcurrentHashMap<DatapathId, IOFSwitchBackend> switches;
private ConcurrentHashMap<DatapathId, IOFSwitch> syncedSwitches;
- /**
- * Tulio Ribeiro
- */
protected static Map<DatapathId, OFControllerRole> switchInitialRole;
private ISwitchDriverRegistry driverRegistry;
@@ -735,13 +732,9 @@ public class OFSwitchManager implements IOFSwitchManager, INewOFConnectionListen
}
- /**
- * Tulio Ribeiro
- */
//Define initial role per switch
String switchesInitialState = configParams.get("switchesInitialState");
switchInitialRole = jsonToSwitchInitialRoleMap(switchesInitialState);
-
log.debug("SwitchInitialRole: {}", switchInitialRole.entrySet());
/*
--
GitLab