commit b6febbe19f0e50cf4267882381f9b948cfdddd83
author Hyunsun Moon <hyunsun.moon@gmail.com> Fri Feb 12 15:59:53 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Mon Feb 15 01:21:46 2016 +0000
tree a9b2bbac34ed0109caf59a347141fbb6795cd378
parent 5f7ed8a42cb2f7dbfbf9db858213b81752fc402f

Implemented dummy Neutron ML2 plugin handler

- Added REST handler for Neutron ML2 ONOS mech driver
- Made cordvtn ARP proxy to handle request for host, too
- Now cordvtn utilizes openstackSwitching only as a Neutron REST client

Change-Id: I6890b6651ddcb9d8cf33fb326e9f0eb721b536a5

src/main/java/org/onosproject/cordvtn/CordVtnArpProxy.java

diff --git a/src/main/java/org/onosproject/cordvtn/CordVtnArpProxy.java b/src/main/java/org/onosproject/cordvtn/CordVtnArpProxy.java
index 3c92404..5f444e0 100644
--- a/src/main/java/org/onosproject/cordvtn/CordVtnArpProxy.java
+++ b/src/main/java/org/onosproject/cordvtn/CordVtnArpProxy.java
@@ -28,6 +28,7 @@
 import org.onosproject.net.flow.DefaultTrafficTreatment;
 import org.onosproject.net.flow.TrafficSelector;
 import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.host.HostService;
 import org.onosproject.net.packet.DefaultOutboundPacket;
 import org.onosproject.net.packet.PacketContext;
 import org.onosproject.net.packet.PacketPriority;
@@ -50,6 +51,7 @@
 
     private final ApplicationId appId;
     private final PacketService packetService;
+    private final HostService hostService;
 
     private Set<Ip4Address> serviceIPs = Sets.newHashSet();
 
@@ -59,9 +61,10 @@
      * @param appId application id
      * @param packetService packet service
      */
-    public CordVtnArpProxy(ApplicationId appId, PacketService packetService) {
+    public CordVtnArpProxy(ApplicationId appId, PacketService packetService, HostService hostService) {
         this.appId = appId;
         this.packetService = packetService;
+        this.hostService = hostService;
     }
 
     /**
@@ -124,14 +127,16 @@
      */
     public void processArpPacket(PacketContext context, Ethernet ethPacket, MacAddress gatewayMac) {
         ARP arpPacket = (ARP) ethPacket.getPayload();
-        Ip4Address targetIp = Ip4Address.valueOf(arpPacket.getTargetProtocolAddress());
-
-        if (arpPacket.getOpCode() != ARP.OP_REQUEST || !serviceIPs.contains(targetIp)) {
+        if (arpPacket.getOpCode() != ARP.OP_REQUEST) {
            return;
         }
 
-        if (gatewayMac.equals(MacAddress.NONE)) {
-            log.debug("Gateway mac address is not set, ignoring ARP request");
+        Ip4Address targetIp = Ip4Address.valueOf(arpPacket.getTargetProtocolAddress());
+        MacAddress macAddr = serviceIPs.contains(targetIp) ?
+                gatewayMac : getMacFromHostService(targetIp);
+
+        if (macAddr.equals(MacAddress.NONE)) {
+            log.debug("Failed to find MAC for {}", targetIp.toString());
             context.block();
             return;
         }
@@ -205,4 +210,27 @@
         eth.setPayload(arp);
         return eth;
     }
+
+    /**
+     * Returns MAC address of a host with a given target IP address by asking to
+     * host service. It does not support overlapping IP.
+     *
+     * @param targetIp target ip
+     * @return mac address, or NONE mac address if it fails to find the mac
+     */
+    private MacAddress getMacFromHostService(IpAddress targetIp) {
+        checkNotNull(targetIp);
+
+        Host host = hostService.getHostsByIp(targetIp)
+                .stream()
+                .findFirst()
+                .orElse(null);
+
+        if (host != null) {
+            log.debug("Found MAC from host service for {}", targetIp.toString());
+            return host.mac();
+        } else {
+            return MacAddress.NONE;
+        }
+    }
 }