Added IPv6 support to HostLocationProvider

This fixes ONOS-637 Change-Id: Ic3a411b7e1a1fcf18e7bc7a1b70d1e57c23a52ce

Added IPv6 support to HostLocationProvider
This fixes ONOS-637 Change-Id: Ic3a411b7e1a1fcf18e7bc7a1b70d1e57c23a52ce
Pavlin Radoslavov
Commit d6612f95c55199cd0a94801f52176ac609162da2 d6612f95 1 parent 89edb541
Showing 2 changed files with 44 additions and 16 deletions
providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
providers/host/src/test/java/org/onosproject/provider/host/impl/HostLocationProviderTest.java
--- a/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
View file @d6612f9
+++ b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
View file @d6612f9
@@ -30,6 +30,7 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.onlab.packet.ARP;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.IPacket;
+import org.onlab.packet.ICMP6;
 import org.onlab.packet.IPv6;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.VlanId;
@@ -80,7 +81,7 @@ public class HostLocationProvider extends AbstractProvider implements HostProvid
     protected HostProviderRegistry providerRegistry;
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected PacketService pktService;
+    protected PacketService packetService;
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected TopologyService topologyService;
@@ -117,22 +118,38 @@ public class HostLocationProvider extends AbstractProvider implements HostProvid
         modified(context);
         providerService = providerRegistry.register(this);
-        pktService.addProcessor(processor, 1);
+        packetService.addProcessor(processor, 1);
         deviceService.addListener(deviceListener);
         TrafficSelector.Builder selectorBuilder =
                 DefaultTrafficSelector.builder();
         selectorBuilder.matchEthType(Ethernet.TYPE_ARP);
-        pktService.requestPackets(selectorBuilder.build(),
+        packetService.requestPackets(selectorBuilder.build(),
                                   PacketPriority.CONTROL, appId);
-        log.info("Started");
+        // IPv6 Neighbor Solicitation packet.
+        selectorBuilder = DefaultTrafficSelector.builder();
+        selectorBuilder.matchEthType(Ethernet.TYPE_IPV6);
+        selectorBuilder.matchIPProtocol(IPv6.PROTOCOL_ICMP6);
+        selectorBuilder.matchIcmpv6Type(ICMP6.NEIGHBOR_SOLICITATION);
+        packetService.requestPackets(selectorBuilder.build(),
+                                     PacketPriority.CONTROL, appId);
+
+        // IPv6 Neighbor Advertisement packet.
+        selectorBuilder = DefaultTrafficSelector.builder();
+        selectorBuilder.matchEthType(Ethernet.TYPE_IPV6);
+        selectorBuilder.matchIPProtocol(IPv6.PROTOCOL_ICMP6);
+        selectorBuilder.matchIcmpv6Type(ICMP6.NEIGHBOR_ADVERTISEMENT);
+        packetService.requestPackets(selectorBuilder.build(),
+                                     PacketPriority.CONTROL, appId);
+
+        log.info("Started with Application ID {}", appId.id());
     }
     @Deactivate
     public void deactivate() {
         providerRegistry.unregister(this);
-        pktService.removeProcessor(processor);
+        packetService.removeProcessor(processor);
         deviceService.removeListener(deviceListener);
         providerService = null;
         log.info("Stopped");
@@ -149,7 +166,8 @@ public class HostLocationProvider extends AbstractProvider implements HostProvid
         } catch (ClassCastException e) {
             hostRemovalEnabled = true;
         }
-        log.info("Host removal is {}", hostRemovalEnabled ? "enabled" : "disabled");
+        log.info("Host removal is {}",
+                 hostRemovalEnabled ? "enabled" : "disabled");
     }
     @Override
@@ -179,16 +197,19 @@ public class HostLocationProvider extends AbstractProvider implements HostProvid
                 return;
             }
-            HostLocation hloc = new HostLocation(heardOn, System.currentTimeMillis());
+            HostLocation hloc =
+                new HostLocation(heardOn, System.currentTimeMillis());
             HostId hid = HostId.hostId(eth.getSourceMAC(), vlan);
             // ARP: possible new hosts, update both location and IP
             if (eth.getEtherType() == Ethernet.TYPE_ARP) {
                 ARP arp = (ARP) eth.getPayload();
-                IpAddress ip = IpAddress.valueOf(IpAddress.Version.INET, arp.getSenderProtocolAddress());
+                IpAddress ip = IpAddress.valueOf(IpAddress.Version.INET,
+                                                 arp.getSenderProtocolAddress());
                 HostDescription hdescr =
-                        new DefaultHostDescription(eth.getSourceMAC(), vlan, hloc, ip);
+                    new DefaultHostDescription(eth.getSourceMAC(), vlan,
+                                               hloc, ip);
                 providerService.hostDetected(hid, hdescr);
             // IPv4: update location only
@@ -197,7 +218,10 @@ public class HostLocationProvider extends AbstractProvider implements HostProvid
                     new DefaultHostDescription(eth.getSourceMAC(), vlan, hloc);
                 providerService.hostDetected(hid, hdescr);
-            // NeighborAdvertisement and NeighborSolicitation: possible new hosts, update both location and IP
+                //
+                // NeighborAdvertisement and NeighborSolicitation: possible
+                // new hosts, update both location and IP.
+                //
                 // IPv6: update location only
             } else if (eth.getEtherType() == Ethernet.TYPE_IPV6) {
                 IpAddress ip = null;
@@ -205,10 +229,12 @@ public class HostLocationProvider extends AbstractProvider implements HostProvid
                 IPacket iPkt = ipv6;
                 while (iPkt != null) {
-                    if (iPkt instanceof NeighborAdvertisement || iPkt instanceof NeighborSolicitation) {
+                    if (iPkt instanceof NeighborAdvertisement ||
+                        iPkt instanceof NeighborSolicitation) {
                         IpAddress sourceAddress =
-                                IpAddress.valueOf(IpAddress.Version.INET6, ipv6.getSourceAddress());
+                            IpAddress.valueOf(IpAddress.Version.INET6,
-                        // Ignore DAD packets, in which source address is all zeros.
+                                              ipv6.getSourceAddress());
+                        // Ignore DAD packets, in which source address is zero
                         if (!sourceAddress.isZero()) {
                             ip = sourceAddress;
                             break;
@@ -217,8 +243,10 @@ public class HostLocationProvider extends AbstractProvider implements HostProvid
                     iPkt = iPkt.getPayload();
                 }
                 HostDescription hdescr = (ip == null) ?
-                        new DefaultHostDescription(eth.getSourceMAC(), vlan, hloc) :
+                    new DefaultHostDescription(eth.getSourceMAC(), vlan,
-                        new DefaultHostDescription(eth.getSourceMAC(), vlan, hloc, ip);
+                                               hloc) :
+                    new DefaultHostDescription(eth.getSourceMAC(), vlan,
+                                               hloc, ip);
                 providerService.hostDetected(hid, hdescr);
             }
         }
--- a/providers/host/src/test/java/org/onosproject/provider/host/impl/HostLocationProviderTest.java
View file @d6612f9
+++ b/providers/host/src/test/java/org/onosproject/provider/host/impl/HostLocationProviderTest.java
View file @d6612f9
@@ -148,7 +148,7 @@ public class HostLocationProviderTest {
         provider.providerRegistry = hostRegistry;
         provider.topologyService = topoService;
-        provider.pktService = packetService;
+        provider.packetService = packetService;
         provider.deviceService = deviceService;
         provider.hostService = hostService;