From: Alessandro Boch <aboch@cisco.com>
Date: Tue, 7 May 2013 00:31:37 +0000 (+0000)
Subject: Merge "Add LLDP retry count to config.ini"
X-Git-Tag: releasepom-0.1.0~483
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=4dd0b2f1ff059a91237dde38d95083e3f6bfd295;hp=b9884eb209543d36371a794b2c02cf5e18ce03f6

Merge "Add LLDP retry count to config.ini"
---

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
index 33789ee2d2..df4526e6f9 100644
--- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
+++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
@@ -62,6 +62,8 @@ org.eclipse.gemini.web.tomcat.config.path=configuration/tomcat-server.xml
 # of.discoveryInterval=300
 # The timeout value in waiting for returned discovery packet (default 60 sec)
 # of.discoveryTimeout=60
+# The number of retries after the initial discovery packet is not received within the timeout period (default 2)
+# of.discoveryRetry=2
 
 # TLS configuration
 # To enable TLS, set secureChannelEnabled=true and specify the location of controller Java KeyStore and TrustStore files.
diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java
index d8fe7a4cae..ef74774511 100644
--- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java
+++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java
@@ -88,7 +88,7 @@ public class DiscoveryService implements IInventoryShimExternalListener,
     private int discoveryBatchRestartTicks = getDiscoveryInterval(); // periodically restart batching process
     private int discoveryBatchPausePeriod = 5; // pause for few secs
     private int discoveryBatchPauseTicks = discoveryBatchRestartTicks - discoveryBatchPausePeriod; // pause after this point
-    private int discoveryRetry = 2; // number of retry after initial timeout
+    private int discoveryRetry = getDiscoveryRetry(); // number of retries after initial timeout
     private int discoveryTimeoutTicks = getDiscoveryTimeout(); // timeout in sec
     private int discoveryAgeoutTicks = 120; // age out 2 min
     private int discoveryConsistencyCheckMultiple = 2; // multiple of discoveryBatchRestartTicks
@@ -968,7 +968,7 @@ public class DiscoveryService implements IInventoryShimExternalListener,
     public void _ptm(CommandInterpreter ci) {
         ci.println("Final timeout ticks " + getDiscoveryFinalTimeoutInterval());
         ci.println("Per timeout ticks " + discoveryTimeoutTicks);
-        ci.println("Retry after initial timeout " + discoveryRetry);
+        ci.println("Number of retries after initial timeout " + discoveryRetry);
     }
 
     public void _psize(CommandInterpreter ci) {
@@ -1482,7 +1482,7 @@ public class DiscoveryService implements IInventoryShimExternalListener,
      * 
      * @return The discovery interval in second
      */
-    private static int getDiscoveryInterval() {
+    private int getDiscoveryInterval() {
         String elapsedTime = System.getProperty("of.discoveryInterval");
         int rv = 300;
 
@@ -1502,7 +1502,7 @@ public class DiscoveryService implements IInventoryShimExternalListener,
      * 
      * @return The discovery timeout in second
      */
-    private static int getDiscoveryTimeout() {
+    private int getDiscoveryTimeout() {
         String elapsedTime = System.getProperty("of.discoveryTimeout");
         int rv = 60;
 
@@ -1515,4 +1515,24 @@ public class DiscoveryService implements IInventoryShimExternalListener,
 
         return rv;
     }
+
+    /**
+     * This method returns the number of retries after the initial discovery
+     * packet is not received within the timeout period. Default is 2 times.
+     * 
+     * @return The number of discovery retries
+     */
+    private int getDiscoveryRetry() {
+        String retry = System.getProperty("of.discoveryRetry");
+        int rv = 2;
+
+        if (retry != null) {
+            try {
+                rv = Integer.parseInt(retry);
+            } catch (Exception e) {
+            }
+        }
+
+        return rv;
+    }
 }