Added getFactory() method to IOFSwitch to get a message factory appropriate
for the switch's OpenFlow version.
This prevents users of the switch having to discriminate what factory to use
based on the switch OpenFlow version.
Change-Id: Iac0454856e35f4429649a6f116da34f4c048f25d
diff --git a/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java b/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java
index c2bb344..efeaf6e 100644
--- a/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java
+++ b/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java
@@ -118,7 +118,7 @@
throw new SwitchDriverSubHandshakeAlreadyStarted();
}
startDriverHandshakeCalled = true;
- factory = floodlightProvider.getOFMessageFactory_13();
+ factory = getFactory();
// configureSwitch();
sendBarrier(true);
}
diff --git a/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplOVS13.java b/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplOVS13.java
index efe43a0..668f84d 100644
--- a/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplOVS13.java
+++ b/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplOVS13.java
@@ -44,7 +44,7 @@
throw new SwitchDriverSubHandshakeAlreadyStarted();
}
startDriverHandshakeCalled = true;
- factory = floodlightProvider.getOFMessageFactory_13();
+ factory = getFactory();
configureSwitch();
}
diff --git a/src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java b/src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java
index 419dc43..a02f0d5 100644
--- a/src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java
+++ b/src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java
@@ -33,7 +33,6 @@
import org.projectfloodlight.openflow.protocol.OFFlowMod;
import org.projectfloodlight.openflow.protocol.OFMessage;
import org.projectfloodlight.openflow.protocol.OFType;
-import org.projectfloodlight.openflow.protocol.OFVersion;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -245,7 +244,6 @@
private FloodlightModuleContext context = null;
private IThreadPoolService threadPool = null;
private IFloodlightProviderService floodlightProvider = null;
- protected Map<OFVersion, OFFactory> ofFactoryMap = null;
// Map of threads versus dpid
private Map<Long, FlowPusherThread> threadMap = null;
@@ -405,9 +403,6 @@
.getServiceImpl(IFloodlightProviderService.class);
this.threadPool = context.getServiceImpl(IThreadPoolService.class);
- ofFactoryMap = new HashMap<>();
- ofFactoryMap.put(OFVersion.OF_10, floodlightProvider.getOFMessageFactory_10());
- ofFactoryMap.put(OFVersion.OF_13, floodlightProvider.getOFMessageFactory_13());
floodlightProvider.addOFMessageListener(OFType.BARRIER_REPLY, this);
}
@@ -415,12 +410,6 @@
* Begin processing queue.
*/
public void start() {
- // TODO BOC
- // if (factory == null) {
- // log.error("FlowPusher not yet initialized.");
- // return;
- // }
-
threadMap = new HashMap<Long, FlowPusherThread>();
for (long i = 0; i < numberThread; ++i) {
FlowPusherThread thread = new FlowPusherThread();
@@ -612,7 +601,7 @@
//
// Create the OpenFlow Flow Modification Entry to push
//
- OFFlowMod fm = flowEntry.buildFlowMod(ofFactoryMap.get(sw.getOFVersion()));
+ OFFlowMod fm = flowEntry.buildFlowMod(sw.getFactory());
// log.trace("Pushing flow mod {}", fm);
return addMessageImpl(sw, fm, priority);
}
@@ -682,7 +671,7 @@
}
protected OFBarrierRequest createBarrierRequest(IOFSwitch sw) {
- OFFactory factory = ofFactoryMap.get(sw.getOFVersion());
+ OFFactory factory = sw.getFactory();
if (factory == null) {
log.error("No OF Message Factory for switch {} with OFVersion {}", sw,
sw.getOFVersion());
diff --git a/src/main/java/net/onrc/onos/core/linkdiscovery/LinkDiscoveryManager.java b/src/main/java/net/onrc/onos/core/linkdiscovery/LinkDiscoveryManager.java
index 4c87501..fbd06b7 100644
--- a/src/main/java/net/onrc/onos/core/linkdiscovery/LinkDiscoveryManager.java
+++ b/src/main/java/net/onrc/onos/core/linkdiscovery/LinkDiscoveryManager.java
@@ -57,7 +57,6 @@
import net.onrc.onos.core.registry.IControllerRegistryService;
import net.onrc.onos.core.util.SwitchPort;
-import org.projectfloodlight.openflow.protocol.OFFactories;
import org.projectfloodlight.openflow.protocol.OFFactory;
import org.projectfloodlight.openflow.protocol.OFMessage;
import org.projectfloodlight.openflow.protocol.OFPacketIn;
@@ -68,7 +67,6 @@
import org.projectfloodlight.openflow.protocol.OFPortState;
import org.projectfloodlight.openflow.protocol.OFPortStatus;
import org.projectfloodlight.openflow.protocol.OFType;
-import org.projectfloodlight.openflow.protocol.OFVersion;
import org.projectfloodlight.openflow.protocol.action.OFAction;
import org.projectfloodlight.openflow.types.OFBufferId;
import org.projectfloodlight.openflow.types.OFPort;
@@ -106,9 +104,6 @@
private static final Logger log =
LoggerFactory.getLogger(LinkDiscoveryManager.class);
- // TODO Remove these factories.
- protected OFFactory factory13 = OFFactories.getFactory(OFVersion.OF_13);
- protected OFFactory factory10 = OFFactories.getFactory(OFVersion.OF_10);
private IFloodlightProviderService controller;
@@ -322,8 +317,7 @@
sw, port);
}
- OFFactory factory = (iofSwitch.getOFVersion() == OFVersion.OF_10)
- ? factory10 : factory13;
+ OFFactory factory = iofSwitch.getFactory();
OFPacketOut po = createLLDPPacketOut(sw, ofpPort, isReverse, factory);
try {
diff --git a/src/main/java/net/onrc/onos/core/packetservice/PacketModule.java b/src/main/java/net/onrc/onos/core/packetservice/PacketModule.java
index 63143cd..ca4c4b1 100644
--- a/src/main/java/net/onrc/onos/core/packetservice/PacketModule.java
+++ b/src/main/java/net/onrc/onos/core/packetservice/PacketModule.java
@@ -54,7 +54,6 @@
private Topology topology;
private IDatagridService datagrid;
private IFlowPusherService flowPusher;
- private OFFactory factory;
private IEventChannel<Long, PacketOutNotification> packetOutEventChannel;
@@ -221,7 +220,6 @@
.getTopology();
datagrid = context.getServiceImpl(IDatagridService.class);
flowPusher = context.getServiceImpl(IFlowPusherService.class);
- factory = floodlightProvider.getOFMessageFactory_10();
}
@Override
@@ -243,6 +241,8 @@
continue;
}
+ OFFactory factory = sw.getFactory();
+
List<OFAction> actions = new ArrayList<>();
for (Short port : outPorts.get(dpid)) {
actions.add(factory.actions().output(OFPort.of(port), Short.MAX_VALUE));