Merge into master from pull request #2128: pull request for BT-95 BT-44...

Merge into master from pull request #2128: pull request for BT-95 BT-44 (https://github.com/bigswitch/bigswitchcontroller/pull/2128)

src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java

@@ -733,7 +733,13 @@ public class LinkDiscoveryManager implements IOFMessageListener,
 
         List<OFAction> actions = getDiscoveryActions(iofSwitch, ofpPort);
         po.setActions(actions);
-        po.setActionsLength(getDiscoveryActionsLength(iofSwitch, ofpPort));
+        
+        short  actionLength = 0;
+        Iterator <OFAction> actionIter = actions.iterator();
+        while (actionIter.hasNext()) {
+            actionLength += actionIter.next().getLength();
+        }
+        po.setActionsLength(actionLength);
 
         // set data
         po.setLengthU(OFPacketOut.MINIMUM_LENGTH + po.getActionsLength()
@@ -751,11 +757,6 @@ public class LinkDiscoveryManager implements IOFMessageListener,
 
     }
 
-    protected short getDiscoveryActionsLength(IOFSwitch iofSwitch,
-            OFPhysicalPort ofpPort) {
-        return (short) OFActionOutput.MINIMUM_LENGTH;
-    }
-
     /**
      * Send LLDPs to all switch-ports
      */