Merge "GetFlowNodeCache cli"

diff --git a/INFO.yaml b/INFO.yaml
index 6b78afc23112748ec66fa2cb45904e78b1e43a6b..5b4a99f560e5f2dfd04b73321a0b0a6a707dbdc4 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -34,56 +34,6 @@ repositories:
     - openflowplugin
 committers:
     - <<: *odl_openflowplugin_ptl
-    - name: 'Shuva Jyoti Kar'
-      email: 'shukar@cisco.com'
-      company: 'cisco'
-      id: 'SHUVA JYOTI KAR'
-      timezone: 'Unknown/Unknown'
-    - name: 'Jozef Bacigal'
-      email: 'jozef.bacigal@pantheon.tech'
-      company: 'pantheon'
-      id: 'batky'
-      timezone: 'Unknown/Unknown'
-    - name: 'Michal Rehak'
-      email: 'lagosaurus.42@gmail.com'
-      company: ''
-      id: 'michal.rehak'
-      timezone: 'Unknown/Unknown'
-    - name: 'Ed Warnicke'
-      email: 'hagbard@gmail.com'
-      company: ''
-      id: 'hagbard'
-      timezone: 'Unknown/Unknown'
-    - name: 'Prasanna Huddar'
-      email: 'prasanna.k.huddar@gmail.com'
-      company: ''
-      id: 'prasannakh'
-      timezone: 'Unknown/Unknown'
-    - name: 'Anil Vishnoi'
-      email: 'avishnoi@redhat.com'
-      company: 'Redhat'
-      id: 'Avishnoi'
-      timezone: 'Unknown/Unknown'
-    - name: 'Jozef Bacigál'
-      email: 'jozef.bacigal@me.com'
-      company: 'me'
-      id: 'jbacigal'
-      timezone: 'Unknown/Unknown'
-    - name: 'Abhijit Kumbhare'
-      email: 'abhijitkoss@gmail.com'
-      company: ''
-      id: 'abhijit2511'
-      timezone: 'Unknown/Unknown'
-    - name: 'Shuva Kar'
-      email: 'shuva.jyoti.kar.87@gmail.com'
-      company: ''
-      id: 'shuvajyotikar'
-      timezone: 'Unknown/Unknown'
-    - name: 'Hema Gopalakrishnan'
-      email: 'hema.gopalkrishnan@ericsson.com'
-      company: 'Ericsson'
-      id: 'Hematg'
-      timezone: 'Unknown/Unknown'
     - name: 'Gobinath Suganthan'
       email: 'gobinath@ericsson.com'
       company: 'Ericsson'

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ForwardingRulesManagerImpl.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ForwardingRulesManagerImpl.java
index 4b45c0f3571881180fff0c690cf8c8f8dedd4507..da39d12b0f3237e75e11a61d98e97f3217f2aadb 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ForwardingRulesManagerImpl.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ForwardingRulesManagerImpl.java
@@ -70,8 +70,8 @@ import org.slf4j.LoggerFactory;
 public class ForwardingRulesManagerImpl implements ForwardingRulesManager {
     private static final Logger LOG = LoggerFactory.getLogger(ForwardingRulesManagerImpl.class);
 
-    static final int STARTUP_LOOP_TICK = 500;
-    static final int STARTUP_LOOP_MAX_RETRIES = 8;
+    static final int STARTUP_LOOP_TICK = 1000;
+    static final int STARTUP_LOOP_MAX_RETRIES = 240;
     private static final int FRM_RECONCILIATION_PRIORITY = Integer.getInteger("frm.reconciliation.priority", 1);
     private static final String SERVICE_NAME = "FRM";
 

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ListenerRegistrationHelper.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ListenerRegistrationHelper.java
index 842560c228b84858fd88e1b4c3562570feb70a2f..46f73d1872379ad2edd310155ca6dac22d22ea5b 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ListenerRegistrationHelper.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ListenerRegistrationHelper.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
 @Singleton
 public class ListenerRegistrationHelper {
     private static final Logger LOG = LoggerFactory.getLogger(ListenerRegistrationHelper.class);
-    private final long inventoryCheckTimer = 1;
+    private static final long INVENTORY_CHECK_TIMER = 1;
     private final String operational = "OPERATIONAL";
     private final ListeningExecutorService listeningExecutorService;
     private final DataBroker dataBroker;
@@ -55,7 +55,7 @@ public class ListenerRegistrationHelper {
             while (! getInventoryConfigDataStoreStatus().equals(operational)) {
                 try {
                     LOG.debug("Retrying for datastore to become operational for listener {}", listener);
-                    Thread.sleep(inventoryCheckTimer * 1000);
+                    Thread.sleep(INVENTORY_CHECK_TIMER * 1000);
                 } catch (InterruptedException e) {
                     LOG.info("registerDataTreeChangeListener thread is interrupted");
                     Thread.currentThread().interrupt();