commit c46af206104467bc3ca4c2c48824c672549574c3
author Thomas Vachuska <tom@onlab.us> Wed Jun 03 16:43:27 2015 -0700
committer Thomas Vachuska <tom@onlab.us> Wed Jun 03 16:43:27 2015 -0700
tree 2aa5ea963ad8da718d0e64f12235528ad5db7c01
parent 98a4a0a81fd7cd2ade410d5a1d848fe2d54abb23

Fixing an issue where intents fail to re-route after a node is restarted; caused by failure to register intent resources correctly.

Change-Id: I239e3b538d5b9134422fa629514e095e4914bb0c

core/api/src/main/java/org/onosproject/net/intent/IntentService.java

diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentService.java b/core/api/src/main/java/org/onosproject/net/intent/IntentService.java
index 2b1b246..d6e1185 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentService.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentService.java
@@ -66,6 +66,13 @@
     Iterable<Intent> getIntents();
 
     /**
+     * Returns an iterable of intent data objects currently in the system.
+     *
+     * @return set of intent data objects
+     */
+    Iterable<IntentData> getIntentData();
+
+    /**
      * Returns the number of intents currently in the system.
      *
      * @return number of intents

core/api/src/main/java/org/onosproject/net/intent/IntentStoreDelegate.java

diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/intent/IntentStoreDelegate.java
index a40ea99..dcb7469 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentStoreDelegate.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentStoreDelegate.java
@@ -29,4 +29,12 @@
      * @param intentData    intent data object
      */
     void process(IntentData intentData);
+
+    /**
+     * Called when a new intent has been updated for which this node is the master.
+     *
+     * @param intentData intent data object
+     */
+    default void onUpdate(IntentData intentData) {
+    }
 }

core/api/src/test/java/org/onosproject/net/intent/FakeIntentManager.java

diff --git a/core/api/src/test/java/org/onosproject/net/intent/FakeIntentManager.java b/core/api/src/test/java/org/onosproject/net/intent/FakeIntentManager.java
index a96967a..a31e986 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/FakeIntentManager.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/FakeIntentManager.java
@@ -183,6 +183,11 @@
     }
 
     @Override
+    public Iterable<IntentData> getIntentData() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
     public long getIntentCount() {
         return intents.size();
     }

core/api/src/test/java/org/onosproject/net/intent/IntentServiceAdapter.java

diff --git a/core/api/src/test/java/org/onosproject/net/intent/IntentServiceAdapter.java b/core/api/src/test/java/org/onosproject/net/intent/IntentServiceAdapter.java
index dea1e64..13786b4 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/IntentServiceAdapter.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/IntentServiceAdapter.java
@@ -43,6 +43,11 @@
     }
 
     @Override
+    public Iterable<IntentData> getIntentData() {
+        return null;
+    }
+
+    @Override
     public long getIntentCount() {
         return 0;
     }