Bug 5270: Fix merging 71/34271/6
authorFlorin Coras <fcoras@cisco.com>
Mon, 8 Feb 2016 17:01:46 +0000 (18:01 +0100)
committerFlorin Coras <fcoras@cisco.com>
Mon, 8 Feb 2016 23:36:09 +0000 (00:36 +0100)
commit35c169df5a8cfd8259fc06f8206d3a7aaf91808f
tree706c3daf309063921e85571454f1c78fafaa592a
parent229e4c5da1caa0d7d9715feb9051f732b35c2da5
Bug 5270: Fix merging

1) Fix merge bit parsing in Map-Register/Notify
2) Sort locators in merged mapping record

Change-Id: I25047d1e39f1f4277e8d92bb9611f42b5876f178
Signed-off-by: Florin Coras <fcoras@cisco.com>
12 files changed:
mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/mapcache/IMappingSystem.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/SimpleMapCache.java
mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MappingMergeUtil.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MapNotifySerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MapRegisterSerializer.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java
mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MapNotifyBuilderHelper.java
mappingservice/lisp-proto/src/main/yang/odl-lisp-proto.yang
mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/util/LispNotificationHelper.java