Bug 6529: Remove registration date when deleting mapping

Change-Id: I4ff664568058aab384abef5c21f4154aa61f42de
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCache.java b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCache.java
index 210cfa8768ac30797a2b3cb1dae14cddac5a2083..ecadaa5345b17e3c786a3ea5f9436a397c242eef 100644 (file)
--- a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCache.java
+++ b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCache.java
@@ -58,6 +58,7 @@ public class FlatMapCache implements IMapCache {
     public void removeMapping(Eid eid, boolean overwrite) {
         Eid key = MaskUtil.normalize(eid);
         dao.removeSpecific(key, SubKeys.RECORD);
+        dao.removeSpecific(key, SubKeys.REGDATE);
     }
 
     @Override

diff --git a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCache.java b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCache.java
index e0541f1306b62fcb0a8fa248ef7e5216ffc508d3..0a2df133cd50cec5beb5d54e75e5e78be5198444 100644 (file)
--- a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCache.java
+++ b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCache.java
@@ -155,9 +155,12 @@ public class MultiTableMapCache implements IMapCache {
             if (db != null) {
                 db.removeSpecific(SourceDestKeyHelper.getSrcBinary(key),
                         SubKeys.RECORD);
+                db.removeSpecific(SourceDestKeyHelper.getSrcBinary(key),
+                        SubKeys.REGDATE);
             }
         } else {
             table.removeSpecific(key, SubKeys.RECORD);
+            table.removeSpecific(key, SubKeys.REGDATE);
         }
     }
 

diff --git a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCache.java b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCache.java
index dd77cbebdbf345e656960b93b252669e002c2226..e8226fa4cbcfd2ad637a8206867459a70bbd492f 100644 (file)
--- a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCache.java
+++ b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCache.java
@@ -227,6 +227,7 @@ public class SimpleMapCache implements IMapCache {
         }
 
         table.removeSpecific(key, SubKeys.RECORD);
+        table.removeSpecific(key, SubKeys.REGDATE);
 
         if (!overwrite) {
             ILispDAO xtrIdTable = getXtrIdTable(key, table);

diff --git a/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCacheTest.java b/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCacheTest.java
index d14c4101cdb5c68f46babe599018e46199101087..580e7589130899a420c596ab283df533bd3be959 100644 (file)
--- a/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCacheTest.java
+++ b/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCacheTest.java
@@ -75,6 +75,7 @@ public class FlatMapCacheTest {
     public void removeMappingTest() {
         flatMapCache.removeMapping(EID_TEST, true);
         verify(daoMock).removeSpecific(NORMALIZED_EID, SubKeys.RECORD);
+        verify(daoMock).removeSpecific(NORMALIZED_EID, SubKeys.REGDATE);
     }
 
     /**

diff --git a/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCacheTest.java b/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCacheTest.java
index 2a1e3082e2bcbc12451092300b88ca4fbd807597..3fad6a1777521e822129d67c8ff29eb8aca89b46 100644 (file)
--- a/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCacheTest.java
+++ b/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCacheTest.java
@@ -194,6 +194,8 @@ public class MultiTableMapCacheTest {
         multiTableMapCache.removeMapping(EID_SOURCE_DEST_KEY_TYPE, true);
         verify(dbMock).removeSpecific(SourceDestKeyHelper.getSrcBinary(NORMALIZED_SRCDST_EID),
                 SubKeys.RECORD);
+        verify(dbMock).removeSpecific(SourceDestKeyHelper.getSrcBinary(NORMALIZED_SRCDST_EID),
+                SubKeys.REGDATE);
     }
 
     /**
@@ -206,6 +208,7 @@ public class MultiTableMapCacheTest {
 
         multiTableMapCache.removeMapping(EID_TEST, true);
         verify(tableDaoMock).removeSpecific(NORMALIZED_EID, SubKeys.RECORD);
+        verify(tableDaoMock).removeSpecific(NORMALIZED_EID, SubKeys.REGDATE);
     }
 
     /**

diff --git a/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCacheTest.java b/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCacheTest.java
index 17701ed3d7563f8d3ea6afc20cc2f7c13e0f139a..ba15133fffb08381c3f643ff9cca266050e1d262 100644 (file)
--- a/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCacheTest.java
+++ b/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCacheTest.java
@@ -128,6 +128,7 @@ public class SimpleMapCacheTest {
 
         simpleMapCache.removeMapping(EID_IPV4, true);
         Mockito.verify(tableMock).removeSpecific(MaskUtil.normalize(EID_IPV4), SubKeys.RECORD);
+        Mockito.verify(tableMock).removeSpecific(MaskUtil.normalize(EID_IPV4), SubKeys.REGDATE);
         Mockito.verifyNoMoreInteractions(tableMock);
     }