commit a1f960b6518ddc9099b8328c6c04e4ab170b39a5
author Jian Li <pyguni@gmail.com> Tue Apr 25 19:12:53 2017 +0900
committer Jian Li <pyguni@gmail.com> Thu May 04 17:41:54 2017 +0000
tree 64013a500c965370aa0cb3c7089e75d7c79b0d4b
parent c56cded49f74a5cf62c8ffaf5b40d855326fdc2b

Fix: Set default state as ADDED for newly added mapping by router

Change-Id: I34eda7f5b229efe273d4a4e61e72082f8f123a2c

apps/mappingmanagement/mgr/src/main/java/org/onosproject/mapping/impl/SimpleMappingStore.java

diff --git a/apps/mappingmanagement/mgr/src/main/java/org/onosproject/mapping/impl/SimpleMappingStore.java b/apps/mappingmanagement/mgr/src/main/java/org/onosproject/mapping/impl/SimpleMappingStore.java
index 8b02868..0eca4bb 100644
--- a/apps/mappingmanagement/mgr/src/main/java/org/onosproject/mapping/impl/SimpleMappingStore.java
+++ b/apps/mappingmanagement/mgr/src/main/java/org/onosproject/mapping/impl/SimpleMappingStore.java
@@ -26,6 +26,7 @@
 import org.onosproject.mapping.DefaultMappingEntry;
 import org.onosproject.mapping.Mapping;
 import org.onosproject.mapping.MappingEntry;
+import org.onosproject.mapping.MappingEntry.MappingEntryState;
 import org.onosproject.mapping.MappingEvent;
 import org.onosproject.mapping.MappingId;
 import org.onosproject.mapping.MappingStore;
@@ -213,14 +214,15 @@
     }
 
     @Override
-    public void storeMapping(Type type, Mapping mapping) {
+    public void storeMapping(Type type, MappingEntry mapping) {
 
         List<StoredMappingEntry> entries =
                 getMappingEntriesInternal(type, mapping.deviceId(), mapping.id());
 
         synchronized (entries) {
             if (!entries.contains(mapping)) {
-                StoredMappingEntry entry = new DefaultMappingEntry(mapping);
+                StoredMappingEntry entry =
+                        new DefaultMappingEntry(mapping, mapping.state());
                 entries.add(entry);
             }
         }
@@ -252,7 +254,7 @@
             for (StoredMappingEntry stored : entries) {
                 if (stored.equals(entry)) {
                     if (stored.state() == PENDING_ADD) {
-                        stored.setState(MappingEntry.MappingEntryState.ADDED);
+                        stored.setState(MappingEntryState.ADDED);
                         return new MappingEvent(MAPPING_ADDED, entry);
                     }
                     return new MappingEvent(MAPPING_UPDATED, entry);