First set of changes to the Cpqd driver to remove hardcoding
and adding ECMP group support
Change-Id: Id34ecd3336ce702e7c151b486c4dd02a28ef1c76
diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index 3550297..72c536f 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -68,6 +68,7 @@
import net.floodlightcontroller.restserver.IRestApiService;
import net.floodlightcontroller.threadpool.IThreadPoolService;
import net.floodlightcontroller.util.LoadMonitor;
+import net.onrc.onos.core.configmanager.INetworkConfigService;
import net.onrc.onos.core.drivermanager.DriverManager;
import net.onrc.onos.core.linkdiscovery.ILinkDiscoveryService;
import net.onrc.onos.core.packet.Ethernet;
@@ -136,6 +137,7 @@
protected IDebugEventService debugEvents;
protected ILinkDiscoveryService linkDiscovery;
+ protected INetworkConfigService networkConfig;
// Configuration options
protected int openFlowPort = 6633;
@@ -483,6 +485,10 @@
this.linkDiscovery = linkDiscovery;
}
+ public void setNetworkConfigService(INetworkConfigService networkConfigService) {
+ this.networkConfig = networkConfigService;
+ }
+
public void setDebugCounter(IDebugCounterService debugCounters) {
this.debugCounters = debugCounters;
}
@@ -993,6 +999,10 @@
}
}
+ public INetworkConfigService getNetworkConfigService() {
+ return networkConfig;
+ }
+
// **************
// Initialization
// **************
diff --git a/src/main/java/net/floodlightcontroller/core/internal/OFChannelHandler.java b/src/main/java/net/floodlightcontroller/core/internal/OFChannelHandler.java
index d2e4156..b011e6b 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/OFChannelHandler.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/OFChannelHandler.java
@@ -1069,7 +1069,7 @@
* controller. Next State: depends on the role of this controller for
* this switch - either MASTER or EQUAL.
*/
- WAIT_SWITCH_DRIVER_SUB_HANDSHAKE(true) {
+ WAIT_SWITCH_DRIVER_SUB_HANDSHAKE(false) {
@Override
void processOFError(OFChannelHandler h, OFErrorMsg m)
@@ -1871,7 +1871,14 @@
void processOFRoleReply(OFChannelHandler h, OFRoleReply m)
throws SwitchStateException, IOException {
- unhandledMessageReceived(h, m);
+ // A role reply message received by the default handler implies
+ // that the channel state-machine is in a state where it does not
+ // expect a role message. That in turn implies that role-request was
+ // sent out by this controller, as a result of a callback
+ // from the registry service, because the chosen master (some other
+ // instance) died, while this controller instance has not completed
+ // handshake yet. Best to disconnect switch and start over.
+ illegalMessageReceived(h, m);
}
void processOFGetAsyncReply(OFChannelHandler h,
@@ -1925,15 +1932,17 @@
* controller that wins mastership. Once the registry API changes to
* reply to every request, we would not need to wait for a timeout to
* move to Role.EQUAL (or SLAVE).
- *
+ *
* @param h the channel handler for this switch
* @param ctx the netty channel handler context for the channel 'h'
* @throws IOException
*/
public void handleTimedOutHandshake(OFChannelHandler h,
ChannelHandlerContext ctx) throws IOException {
- log.error("Disconnecting switch {}: failed to complete handshake",
- h.getSwitchInfoString());
+ log.error("Disconnecting switch {}: failed to complete handshake " +
+ "in state {} (with driverState: {})",
+ h.getSwitchInfoString(), h.getStateForTesting(),
+ h.sw.getSwitchDriverState());
h.counters.switchDisconnectHandshakeTimeout.updateCounterWithFlush();
ctx.getChannel().close();
}
diff --git a/src/main/java/net/floodlightcontroller/core/internal/OFSwitchImplBase.java b/src/main/java/net/floodlightcontroller/core/internal/OFSwitchImplBase.java
index 3e6d7b2..254e658 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/OFSwitchImplBase.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/OFSwitchImplBase.java
@@ -1286,4 +1286,9 @@
public Lock getListenerWriteLock() {
return listenerLock.writeLock();
}
+
+ public String getSwitchDriverState() {
+ return "";
+ }
+
}