Bug 8549 - Inter OVS traffic over EVPN does not work with

openstack-vni-semantics-enforce set to true

Change-Id: I401107b046695ec9af9feebbc47ecce0461b0b07
Signed-off-by: eupakir <kiran.n.upadhyaya@ericsson.com>

diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/EVPNVrfEntryProcessor.java b/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/EVPNVrfEntryProcessor.java
index 74e70d6082d4a97fccd2e40c9c82cfa0e55ea2ad..959f3b76a80b1be8e1e6a87745c5404de9e767b3 100644 (file)
--- a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/EVPNVrfEntryProcessor.java
+++ b/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/EVPNVrfEntryProcessor.java
@@ -225,6 +225,9 @@ public class EVPNVrfEntryProcessor {
             String interfaceName = prefixInfo.getVpnInterfaceName();
             if (vrfEntry.getOrigin().equals(RouteOrigin.BGP) || isNatPrefix) {
                 tunnelId = BigInteger.valueOf(vrfEntry.getL3vni());
+            } else if (vrfEntryListener.isOpenStackVniSemanticsEnforced) {
+                tunnelId = BigInteger.valueOf(FibUtil.getVniForVxlanNetwork(dataBroker,
+                        prefixInfo.getSubnetId()).get());
             } else {
                 Interface interfaceState = FibUtil.getInterfaceStateFromOperDS(dataBroker, interfaceName);
                 tunnelId = BigInteger.valueOf(interfaceState.getIfIndex());