Bug 4909: Fix ServicePath LCAF normalization

Change-Id: Ie30450d4bf5e36aacf88fabc840eadb9a404faae
Signed-off-by: Florin Coras <fcoras@cisco.com>

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java
index fd5532e19e24e818cda8339dfef8f4eb98eff79c..a496f7e95004dadeb19f41520f259a1f81e5f552 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java
@@ -93,7 +93,7 @@ public final class MaskUtil {
             } else if (address instanceof ServicePath) {
                 // Build new Service Path eid with service index set to 0
                 long spi = ((ServicePath) address).getServicePath().getServicePathId().getValue();
-                return LispAddressUtil.asServicePathEid(0, spi, (short)0);
+                return LispAddressUtil.asServicePathEid(eid.getVirtualNetworkId().getValue(), spi, (short)0);
             }
         } catch (UnknownHostException e) {
             LOG.trace("Failed to normalize eid {}: {}", eid, ExceptionUtils.getStackTrace(e));