Code Review / openflowplugin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bug 1764 - moved Session related interfaces to openflowplugin-api
[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / lldp / LLDPSpeaker.java
diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/lldp/LLDPSpeaker.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/lldp/LLDPSpeaker.java
index 4c0e2483679fe6a2e29b48dab14b25b1ecdbfdec..2f97e13513e2a0bf2fa49067d6623065bf320bbd 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/lldp/LLDPSpeaker.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/lldp/LLDPSpeaker.java
@@ -14,16 +14,15 @@ import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ConcurrentHashMap;
-
 import org.opendaylight.controller.liblldp.EtherTypes;
 import org.opendaylight.controller.liblldp.Ethernet;
 import org.opendaylight.controller.liblldp.HexEncode;
 import org.opendaylight.controller.liblldp.LLDP;
 import org.opendaylight.controller.liblldp.LLDPTLV;
 import org.opendaylight.controller.liblldp.PacketException;
-import org.opendaylight.openflowplugin.openflow.md.ModelDrivenSwitch;
+import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
+import org.opendaylight.openflowplugin.api.openflow.md.ModelDrivenSwitch;
 import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil;
-import org.opendaylight.openflowplugin.openflow.md.util.OpenflowVersion;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId;
@@ -43,65 +42,79 @@ import org.slf4j.LoggerFactory;
 public class LLDPSpeaker {
     private static Logger LOG = LoggerFactory.getLogger(LLDPSpeaker.class);
 
-       private  final Map<InstanceIdentifier<NodeConnector>,TransmitPacketInput> nodeConnectorMap = new ConcurrentHashMap<InstanceIdentifier<NodeConnector>,TransmitPacketInput>();
-       private  final Map<InstanceIdentifier<Node>,ModelDrivenSwitch> nodeMap = new ConcurrentHashMap<InstanceIdentifier<Node>,ModelDrivenSwitch>();
-       private static final LLDPSpeaker instance = new LLDPSpeaker();
-       private Timer timer = new Timer();
-       private static final int DELAY = 0;
-       private static final int PERIOD = 1000*5;
-
-       private LLDPSpeaker() {
-           timer.schedule(new LLDPSpeakerTask(), DELAY, PERIOD);
-       }
-
-       public static LLDPSpeaker getInstance() {
-           return instance;
-       }
-
-       public  void addModelDrivenSwitch(InstanceIdentifier<Node> nodeInstanceId, ModelDrivenSwitch sw) {
-               nodeMap.put(nodeInstanceId,sw);
-       }
-
-       public void removeModelDrivenSwitch(InstanceIdentifier<Node> nodeInstanceId) {
-           nodeMap.remove(nodeInstanceId);
-           for (InstanceIdentifier<NodeConnector> nodeConnectorInstanceId : nodeConnectorMap.keySet()) {
-               if(nodeInstanceId.equals(nodeConnectorInstanceId.firstIdentifierOf(Node.class))) {
-                   nodeConnectorMap.remove(nodeConnectorInstanceId);
-               }
-           }
-       }
-
-       public  void addNodeConnector(InstanceIdentifier<NodeConnector> nodeConnectorInstanceId, NodeConnector nodeConnector) {
-       InstanceIdentifier<Node> nodeInstanceId = nodeConnectorInstanceId.firstIdentifierOf(Node.class);
+    private final Map<InstanceIdentifier<NodeConnector>, TransmitPacketInput> nodeConnectorMap = new ConcurrentHashMap<InstanceIdentifier<NodeConnector>, TransmitPacketInput>();
+    private final Map<InstanceIdentifier<Node>, ModelDrivenSwitch> nodeMap = new ConcurrentHashMap<InstanceIdentifier<Node>, ModelDrivenSwitch>();
+    private static final LLDPSpeaker instance = new LLDPSpeaker();
+    private Timer timer = new Timer();
+    private static final int DELAY = 0;
+    private static final int PERIOD = 1000 * 5;
+
+    private LLDPSpeaker() {
+        timer.schedule(new LLDPSpeakerTask(), DELAY, PERIOD);
+    }
+
+    public static LLDPSpeaker getInstance() {
+        return instance;
+    }
+
+    public void addModelDrivenSwitch(InstanceIdentifier<Node> nodeInstanceId, ModelDrivenSwitch sw) {
+        nodeMap.put(nodeInstanceId, sw);
+    }
+
+    public void removeModelDrivenSwitch(InstanceIdentifier<Node> nodeInstanceId) {
+        nodeMap.remove(nodeInstanceId);
+        for (InstanceIdentifier<NodeConnector> nodeConnectorInstanceId : nodeConnectorMap.keySet()) {
+            if (nodeInstanceId.equals(nodeConnectorInstanceId.firstIdentifierOf(Node.class))) {
+                nodeConnectorMap.remove(nodeConnectorInstanceId);
+            }
+        }
+    }
+
+    public void addNodeConnector(InstanceIdentifier<NodeConnector> nodeConnectorInstanceId, NodeConnector nodeConnector) {
+        InstanceIdentifier<Node> nodeInstanceId = nodeConnectorInstanceId.firstIdentifierOf(Node.class);
         ModelDrivenSwitch md = nodeMap.get(nodeInstanceId);
 
-       NodeKey nodeKey = InstanceIdentifier.keyOf(nodeInstanceId);
-       NodeId nodeId = nodeKey.getId();
-       NodeConnectorId nodeConnectorId = nodeConnector.getId();
-       FlowCapableNodeConnector flowConnector = nodeConnector.<FlowCapableNodeConnector>getAugmentation(FlowCapableNodeConnector.class);
-       TransmitPacketInputBuilder tpib = new TransmitPacketInputBuilder();
-       tpib.setEgress(new NodeConnectorRef(nodeConnectorInstanceId));
-       tpib.setNode(new NodeRef(nodeInstanceId));
-       tpib.setPayload(lldpDataFrom(nodeInstanceId,nodeConnectorInstanceId,flowConnector.getHardwareAddress(),
-                md.getSessionContext().getPrimaryConductor().getVersion()));
-       nodeConnectorMap.put(nodeConnectorInstanceId, tpib.build());
-
-        md.transmitPacket(nodeConnectorMap.get(nodeConnectorInstanceId));
-       }
-
-       public  void removeNodeConnector(
-                       InstanceIdentifier<NodeConnector> nodeConnectorInstanceId,
-                       NodeConnector nodeConnector) {
-               nodeConnectorMap.remove(nodeConnectorInstanceId);
-       }
-
-       private  byte[] lldpDataFrom(InstanceIdentifier<Node> nodeInstanceId,InstanceIdentifier<NodeConnector> nodeConnectorInstanceId,MacAddress src,
-                                 Short version) {
-
-           NodeId nodeId = InstanceIdentifier.keyOf(nodeInstanceId).getId();
-           NodeConnectorId nodeConnectorId = InstanceIdentifier.keyOf(nodeConnectorInstanceId).getId();
-               // Create LLDP TTL TLV
-        byte[] ttl = new byte[] { (byte) 0, (byte) 120 };
+        NodeKey nodeKey = InstanceIdentifier.keyOf(nodeInstanceId);
+        NodeId nodeId = nodeKey.getId();
+        NodeConnectorId nodeConnectorId = nodeConnector.getId();
+        FlowCapableNodeConnector flowConnector = nodeConnector.<FlowCapableNodeConnector>getAugmentation(FlowCapableNodeConnector.class);
+        TransmitPacketInputBuilder tpib = new TransmitPacketInputBuilder();
+        tpib.setEgress(new NodeConnectorRef(nodeConnectorInstanceId));
+        tpib.setNode(new NodeRef(nodeInstanceId));
+        if(nodeInstanceId == null) {
+            LOG.warn("addNodeConnector(): nodeInstanceId should not be null nodeConnectorInstanceId {} nodeConnector {}",nodeConnectorInstanceId,nodeConnector);
+        } else if (nodeConnectorInstanceId == null) {
+            LOG.warn("addNodeConnector(): nodeConnectorInstanceId should not be null nodeConnectorInstanceId {} nodeConnector {}",nodeConnectorInstanceId,nodeConnector);
+        } else if (flowConnector == null) {
+            LOG.warn("addNodeConnector(): flowConnector should not be null nodeConnectorInstanceId {} nodeConnector {}",nodeConnectorInstanceId,nodeConnector);
+        } else if (md == null) {
+            LOG.debug("addNodeConnector(): md is null, this usually means your switch disconnected while you had unprocessed NodeConnectorUpdated messages in queue nodeConnectorInstanceId {} nodeConnector {}",nodeConnectorInstanceId,nodeConnector);
+        } else if(md.getSessionContext() == null) {
+            LOG.warn("addNodeConnector(): md.getSessionContext() should not be null nodeConnectorInstanceId {} nodeConnector {}",nodeConnectorInstanceId,nodeConnector);
+        } else if (md.getSessionContext().getPrimaryConductor() == null) {
+            LOG.warn("addNodeConnector(): md.getSessionContext().getPrimaryConductor() should not be null nodeConnectorInstanceId {} nodeConnector {}",nodeConnectorInstanceId,nodeConnector);
+        } else {
+            tpib.setPayload(lldpDataFrom(nodeInstanceId,nodeConnectorInstanceId,flowConnector.getHardwareAddress(),
+                    md.getSessionContext().getPrimaryConductor().getVersion()));
+            nodeConnectorMap.put(nodeConnectorInstanceId, tpib.build());
+
+            md.transmitPacket(nodeConnectorMap.get(nodeConnectorInstanceId));
+        }
+    }
+
+    public void removeNodeConnector(
+            InstanceIdentifier<NodeConnector> nodeConnectorInstanceId,
+            NodeConnector nodeConnector) {
+        nodeConnectorMap.remove(nodeConnectorInstanceId);
+    }
+
+    private byte[] lldpDataFrom(InstanceIdentifier<Node> nodeInstanceId, InstanceIdentifier<NodeConnector> nodeConnectorInstanceId, MacAddress src,
+                                Short version) {
+
+        NodeId nodeId = InstanceIdentifier.keyOf(nodeInstanceId).getId();
+        NodeConnectorId nodeConnectorId = InstanceIdentifier.keyOf(nodeConnectorInstanceId).getId();
+        // Create LLDP TTL TLV
+        byte[] ttl = new byte[]{(byte) 0, (byte) 120};
         LLDPTLV ttlTlv = new LLDPTLV();
         ttlTlv.setType(LLDPTLV.TLVType.TTL.getValue()).setLength((short) ttl.length).setValue(ttl);
 
@@ -154,10 +167,10 @@ public class LLDPSpeaker {
             byte[] data = ethPkt.serialize();
             return data;
         } catch (PacketException e) {
-            LOG.error("Error creating LLDP packet",e);
+            LOG.error("Error creating LLDP packet", e);
         }
         return null;
-       }
+    }
 
     private class LLDPSpeakerTask extends TimerTask {
 
@@ -171,9 +184,9 @@ public class LLDPSpeaker {
 
         }
 
-       }
+    }
 
-       private String colonize(String orig) {
-           return orig.replaceAll("(?<=..)(..)", ":$1");
-       }
+    private String colonize(String orig) {
+        return orig.replaceAll("(?<=..)(..)", ":$1");
+    }
 }
OpenFlow Plugin