Make the sanity test countup limit a constant and set it to 120

Also add some additional output indicating how long we've been
tryign to start.

Change-Id: I02778bdbee6b9778249cae318debff360ca89a7a
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/opendaylight/distribution/sanitytest/src/main/java/org/opendaylight/controller/sanitytest/internal/Activator.java b/opendaylight/distribution/sanitytest/src/main/java/org/opendaylight/controller/sanitytest/internal/Activator.java
index 2678552..08f0700 100644 (file)
--- a/opendaylight/distribution/sanitytest/src/main/java/org/opendaylight/controller/sanitytest/internal/Activator.java
+++ b/opendaylight/distribution/sanitytest/src/main/java/org/opendaylight/controller/sanitytest/internal/Activator.java
@@ -12,6 +12,7 @@ public class Activator implements BundleActivator {
     //10 Second initial, 1 second subsequent
     private static final int INITIAL_DELAY = 10000;
     private static final int SUBSEQUENT_DELAY = 1000;
+    private static final int MAX_ATTEMPTS = 120;
 
 
     private String stateToString(int state) {
@@ -66,7 +67,7 @@ public class Activator implements BundleActivator {
                     }
                     if (!resolved) {
                         countup++;
-                        if (countup < 60) {
+                        if (countup < MAX_ATTEMPTS) {
                             System.out.println("all bundles haven't finished starting, will repeat");
                             try {
                                 Thread.sleep(SUBSEQUENT_DELAY);