Enabling LLDP programming again.

Upon debugging, it was found that the timeouts and instability observed on the controller were due to
permgen issues (caused by multi-node devstack consuming up most of the laptop memory).

Change-Id: Ic401615d67bd59f79369d3ff69429a2b366e817f
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
index 8c58157f015613b4c453572a8b0e46308f265954..5750e1b76020035e094a1e0c7f9be7b742d0338c 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
@@ -200,16 +200,8 @@ public class InternalNetworkManager {
         }
 
         this.initializeOFNormalFlowRules(node, AdminConfigManager.getManager().getIntegrationBridgeName());
-        /*
-         * Disabling LLDP Punt rules to Controller for now.
-         * In a multi-node setup, it seems to cause issues with the Controller (CPU spike and some OF message timeouts).
-         * It is better to debug that and once we have an idea, we can enable this.
-         * There is NO functional impact to the Neutron integration with OVSDB by disabling LLDP flow installation.
-         */
-        /*
         this.initializeLLDPFlowRules(node, AdminConfigManager.getManager().getTunnelBridgeName());
         this.initializeLLDPFlowRules(node, AdminConfigManager.getManager().getIntegrationBridgeName());
-        */
     }
 
     private void initializeOFNormalFlowRules(Node node, String bridgeName) {