-
/*
* Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.
*
import org.opendaylight.controller.sal.packet.PacketResult;
import org.opendaylight.controller.sal.packet.RawPacket;
import org.opendaylight.controller.sal.utils.GlobalConstants;
+import org.opendaylight.controller.sal.utils.HexEncode;
public class DataPacketMuxDemux implements IContainerListener,
IMessageListener, IDataPacketMux, IInventoryShimExternalListener {
private ConcurrentMap<Long, ISwitch> swID2ISwitch = new ConcurrentHashMap<Long, ISwitch>();
// Gives a map between a Container and all the DataPacket listeners on SAL
private ConcurrentMap<String, IPluginOutDataPacketService> pluginOutDataPacketServices = new ConcurrentHashMap<String, IPluginOutDataPacketService>();
- // Gives a map between a NodeConnector and the containers to which it belongs
+ // Gives a map between a NodeConnector and the containers to which it
+ // belongs
private ConcurrentMap<NodeConnector, List<String>> nc2Container = new ConcurrentHashMap<NodeConnector, List<String>>();
// Gives a map between a Container and the FlowSpecs on it
private ConcurrentMap<String, List<ContainerFlow>> container2FlowSpecs = new ConcurrentHashMap<String, List<ContainerFlow>>();
// replication is done in the SAL implementation toward
// the different APPS
this.pluginOutDataPacketServices.put(containerName, s);
- logger.debug("New outService for container:" + containerName);
+ logger.debug("New outService for container: {}", containerName);
}
}
}
if (this.pluginOutDataPacketServices != null) {
this.pluginOutDataPacketServices.remove(containerName);
- logger.debug("Removed outService for container:" + containerName);
+ logger.debug("Removed outService for container: {}", containerName);
}
}
/**
* Function called by the dependency manager when all the required
* dependencies are satisfied
- *
+ *
*/
void init() {
this.controller.addMessageListener(OFType.PACKET_IN, this);
}
/**
- * Function called by the dependency manager when at least one
- * dependency become unsatisfied or when the component is shutting
- * down because for example bundle is being stopped.
- *
+ * Function called by the dependency manager when at least one dependency
+ * become unsatisfied or when the component is shutting down because for
+ * example bundle is being stopped.
+ *
*/
void destroy() {
this.controller.removeMessageListener(OFType.PACKET_IN, this);
if (sw == null || msg == null
|| this.pluginOutDataPacketServices == null) {
// Something fishy, we cannot do anything
+ logger.debug(
+ "sw: {} and/or msg: {} and/or pluginOutDataPacketServices: {} is null!",
+ new Object[] { sw, msg, this.pluginOutDataPacketServices });
return;
}
if (msg instanceof OFPacketIn) {
.get(GlobalConstants.DEFAULT.toString());
if (defaultOutService != null) {
defaultOutService.receiveDataPacket(dataPacket);
- logger.trace("Dispatched to apps a frame of size: "
- + ofPacket.getPacketData().length
- + " on container: "
- + GlobalConstants.DEFAULT.toString());
+ if (logger.isTraceEnabled()) {
+ logger.trace(
+ "Dispatched to apps a frame of size: {} on " +
+ "container: {}: {}", new Object[] {
+ ofPacket.getPacketData().length,
+ GlobalConstants.DEFAULT.toString(),
+ HexEncode.bytesToHexString(dataPacket
+ .getPacketData()) });
+ }
}
// Now check the mapping between nodeConnector and
- // Container and later on optinally filter based on
+ // Container and later on optimally filter based on
// flowSpec
List<String> containersRX = this.nc2Container.get(p);
if (containersRX != null) {
if (s != null) {
// TODO add filtering on a per-flowSpec base
s.receiveDataPacket(dataPacket);
- logger.trace("Dispatched to apps a frame of size: "
- + ofPacket.getPacketData().length
- + " on container: " + container);
-
+ if (logger.isTraceEnabled()) {
+ logger.trace(
+ "Dispatched to apps a frame of size: {}" +
+ " on container: {}: {}", new Object[] {
+ ofPacket.getPacketData().length,
+ container,
+ HexEncode.bytesToHexString(dataPacket
+ .getPacketData()) });
+ }
}
}
}
public void transmitDataPacket(RawPacket outPkt) {
// Sanity check area
if (outPkt == null) {
+ logger.debug("outPkt is null!");
return;
}
NodeConnector outPort = outPkt.getOutgoingNodeConnector();
if (outPort == null) {
+ logger.debug("outPort is null! outPkt: {}", outPkt);
return;
}
if (!outPort.getType().equals(
NodeConnector.NodeConnectorIDType.OPENFLOW)) {
// The output Port is not of type OpenFlow
+ logger.debug("outPort is not OF Type! outPort: {}", outPort);
return;
}
if (sw == null) {
// If we cannot get the controller descriptor we cannot even
// send out the frame
+ logger.debug("swID: {} - sw is null!", swID);
return;
}
// build action
OFActionOutput action = new OFActionOutput().setPort(port);
// build packet out
- OFPacketOut po = new OFPacketOut().setBufferId(
- OFPacketOut.BUFFER_ID_NONE).setInPort(OFPort.OFPP_NONE)
+ OFPacketOut po = new OFPacketOut()
+ .setBufferId(OFPacketOut.BUFFER_ID_NONE)
+ .setInPort(OFPort.OFPP_NONE)
.setActions(Collections.singletonList((OFAction) action))
.setActionsLength((short) OFActionOutput.MINIMUM_LENGTH);
+ data.length);
po.setPacketData(data);
- sw.asyncSend(po);
- logger.trace("Transmitted a frame of size:" + data.length);
+ // send PACKET_OUT at high priority
+ sw.asyncFastSend(po);
+ logger.trace("Transmitted a frame of size: {}", data.length);
}
public void addNode(Node node, Set<Property> props) {
- if (node == null)
+ if (node == null) {
+ logger.debug("node is null!");
return;
+ }
long sid = (Long) node.getID();
ISwitch sw = controller.getSwitches().get(sid);
- if (sw != null) {
- this.swID2ISwitch.put(sw.getId(), sw);
+ if (sw == null) {
+ logger.debug("sid: {} - sw is null!", sid);
+ return;
}
+ this.swID2ISwitch.put(sw.getId(), sw);
}
public void removeNode(Node node) {
- if (node == null)
+ if (node == null) {
+ logger.debug("node is null!");
return;
+ }
long sid = (Long) node.getID();
ISwitch sw = controller.getSwitches().get(sid);
- if (sw != null) {
- this.swID2ISwitch.remove(sw.getId());
+ if (sw == null) {
+ logger.debug("sid: {} - sw is null!", sid);
+ return;
}
+ this.swID2ISwitch.remove(sw.getId());
}
@Override
if (fSpecs == null) {
fSpecs = new CopyOnWriteArrayList<ContainerFlow>();
}
- boolean updateMap = false;
switch (t) {
case ADDED:
if (!fSpecs.contains(previousFlow)) {
case CHANGED:
break;
}
- if (updateMap) {
- if (fSpecs.isEmpty()) {
- this.container2FlowSpecs.remove(containerName);
- } else {
- this.container2FlowSpecs.put(containerName, fSpecs);
- }
- }
}
@Override
Code Review / controller.git / blobdiff