Merge activation by Map-Register flag 33/38333/1
authorLorand Jakab <lojakab@cisco.com>
Tue, 3 May 2016 13:36:21 +0000 (16:36 +0300)
committerLorand Jakab <lojakab@cisco.com>
Tue, 3 May 2016 13:36:21 +0000 (16:36 +0300)
commit61c7e59e342369d5a11d12553a5b5874a5f6afba
treeeeb85cda64e9ae2754d316de6eabb086ba04753d
parent13361995e1e266f4f2dbee92102e5328620afa1b
Merge activation by Map-Register flag

In addition to user configuration, use the merge-enabled flag in
Map-Register messages to activate mapping merging. Only when both are
enabled will merging happen.

Change-Id: I81fc7657111902478490ed7a01c88f736e4cb7dc
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
16 files changed:
integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTest.java
integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MultiSiteScenario.java
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/mapcache/IMapCache.java
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/mapcache/IMappingSystem.java
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/mappingservice/IMappingService.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingService.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingSystem.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServer.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mapcache/FlatMapCache.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mapcache/MultiTableMapCache.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mapcache/SimpleMapCache.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListener.java
mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServerTest.java
mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MappingServiceTest.java
mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mapcache/FlatMapCacheTest.java
mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mapcache/MultiTableMapCacheTest.java