ONOS-1992 Improving IntentCleanup configurability and adding enabled property

Change-Id: Id6daa33448a3ffee91e98a61e4bea24d1f8c06ca

@@ -61,6 +61,10 @@ public class IntentCleanup implements Runnable, IntentListener {
     private static final int DEFAULT_PERIOD = 5; //seconds
     private static final int DEFAULT_PERIOD = 5; //seconds
     private static final int DEFAULT_THRESHOLD = 5; //tries
     private static final int DEFAULT_THRESHOLD = 5; //tries
 
 
+    @Property(name = "enabled", boolValue = true,
+              label = "Enables/disables the intent cleanup component")
+    private boolean enabled = true;
+
     @Property(name = "period", intValue = DEFAULT_PERIOD,
     @Property(name = "period", intValue = DEFAULT_PERIOD,
               label = "Frequency in ms between cleanup runs")
               label = "Frequency in ms between cleanup runs")
     protected int period = DEFAULT_PERIOD;
     protected int period = DEFAULT_PERIOD;
@@ -108,40 +112,50 @@ public class IntentCleanup implements Runnable, IntentListener {
         Dictionary<?, ?> properties = context != null ? context.getProperties() : new Properties();
         Dictionary<?, ?> properties = context != null ? context.getProperties() : new Properties();
 
 
         int newPeriod;
         int newPeriod;
+        boolean newEnabled;
         try {
         try {
             String s = get(properties, "period");
             String s = get(properties, "period");
             newPeriod = isNullOrEmpty(s) ? period : Integer.parseInt(s.trim());
             newPeriod = isNullOrEmpty(s) ? period : Integer.parseInt(s.trim());
 
 
             s = get(properties, "retryThreshold");
             s = get(properties, "retryThreshold");
-            retryThreshold = isNullOrEmpty(s) ? period : Integer.parseInt(s.trim());
+            retryThreshold = isNullOrEmpty(s) ? retryThreshold : Integer.parseInt(s.trim());
+
+            s = get(properties, "enabled");
+            newEnabled = isNullOrEmpty(s) ? enabled : Boolean.parseBoolean(s.trim());
         } catch (NumberFormatException e) {
         } catch (NumberFormatException e) {
             log.warn(e.getMessage());
             log.warn(e.getMessage());
             newPeriod = period;
             newPeriod = period;
+            newEnabled = enabled;
         }
         }
 
 
         // Any change in the following parameters implies hard restart
         // Any change in the following parameters implies hard restart
-        if (newPeriod != period) {
+        if (newPeriod != period || enabled != newEnabled) {
             period = newPeriod;
             period = newPeriod;
+            enabled = newEnabled;
             adjustRate();
             adjustRate();
         }
         }
 
 
-        log.info("Settings: period={}", period);
+        log.info("Settings: enabled={}, period={}, retryThreshold={}",
+                 enabled, period, retryThreshold);
     }
     }
 
 
     protected void adjustRate() {
     protected void adjustRate() {
         if (timerTask != null) {
         if (timerTask != null) {
             timerTask.cancel();
             timerTask.cancel();
+            timerTask = null;
         }
         }
 
 
-        timerTask = new TimerTask() {
-            @Override
-            public void run() {
-                executor.submit(IntentCleanup.this);
-            }
-        };
+        if (enabled) {
+            timerTask = new TimerTask() {
+                @Override
+                public void run() {
+                    executor.submit(IntentCleanup.this);
+                }
+            };
 
 
-        periodMs = period * 1_000; //convert to ms
-        timer.scheduleAtFixedRate(timerTask, periodMs, periodMs);
+            periodMs = period * 1_000; //convert to ms
+            timer.scheduleAtFixedRate(timerTask, periodMs, periodMs);
+        }
     }
     }
 
 
 
 
@@ -224,7 +238,7 @@ public class IntentCleanup implements Runnable, IntentListener {
     public void event(IntentEvent event) {
     public void event(IntentEvent event) {
         // this is the fast path for CORRUPT intents, retry on event notification.
         // this is the fast path for CORRUPT intents, retry on event notification.
         //TODO we might consider using the timer to back off for subsequent retries
         //TODO we might consider using the timer to back off for subsequent retries
-        if (event.type() == IntentEvent.Type.CORRUPT) {
+        if (enabled && event.type() == IntentEvent.Type.CORRUPT) {
             Key key = event.subject().key();
             Key key = event.subject().key();
             if (store.isMaster(key)) {
             if (store.isMaster(key)) {
                 IntentData data = store.getIntentData(event.subject().key());
                 IntentData data = store.getIntentData(event.subject().key());