Fix for local build to pass

After merging of following commit
https://git.opendaylight.org/gerrit/#/c/41817/
local build of netvirt was failing.

This patch gives a fix for that.

Change-Id: I7517ae833b3418a1c6926decc5c427f10bfa55a4
Signed-off-by: Suraj Ranjan <suraj.ranjan@ericsson.com>

diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpNotificationHandler.java b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpNotificationHandler.java
index f1dfadd8db00c2692576e3ee1ebe2288fa544b5c..349ee8633f035858153556dfa48663cc8b0772ca 100644 (file)
--- a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpNotificationHandler.java
+++ b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpNotificationHandler.java
@@ -42,7 +42,7 @@ public class ArpNotificationHandler implements OdlArputilListener {
         // Respond to ARP request only if vpnservice is configured on the interface
         if(VpnUtil.isVpnInterfaceConfigured(broker, srcInterface)) {
             LOG.info("Received ARP Request for interface {} ", srcInterface);
-            vpnIfManager.processArpRequest(srcIP, srcMac, targetIP, srcInterface);
+            vpnIfManager.processArpRequest(srcIP, srcMac, targetIP, null, srcInterface);
         }
     }
      

diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java
index dab6f326aa18260cd161c0218ddb181860f4bd24..080598bb5fc0a8eee21f3475f36b7ed254c968f5 100644 (file)
--- a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java
+++ b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java
@@ -626,9 +626,10 @@ public class VpnInterfaceManager extends AbstractDataChangeListener<VpnInterface
         }
     }
 
-    public void processArpRequest(IpAddress srcIP, PhysAddress srcMac, IpAddress targetIP, String srcInterface){
+    public void processArpRequest(IpAddress srcIP, PhysAddress srcMac, IpAddress targetIP, PhysAddress targetMac,String srcInterface){
+        //Build ARP response with ARP requests TargetIp TargetMac as the Arp Response SrcIp and SrcMac
         SendArpResponseInput input = new SendArpResponseInputBuilder().setInterface(srcInterface)
-                                                                    .setIpaddress(srcIP).setSrcIpAddress(targetIP).setMacaddress(srcMac).build();
+                .setDstIpaddress(srcIP).setDstMacaddress(srcMac).setSrcIpaddress(targetIP).setSrcMacaddress(targetMac).build();
         final String msgFormat = String.format("Send ARP Response on interface %s to destination %s", srcInterface, srcIP);
         Future<RpcResult<Void>> future = arpManager.sendArpResponse(input);
         Futures.addCallback(JdkFutureAdapters.listenInPoolThread(future), new FutureCallback<RpcResult<Void>>() {