diff --git a/providers/host/src/test/java/org/onosproject/provider/host/impl/HostLocationProviderTest.java b/providers/host/src/test/java/org/onosproject/provider/host/impl/HostLocationProviderTest.java
index db1eb0f..6cbb623 100644
--- a/providers/host/src/test/java/org/onosproject/provider/host/impl/HostLocationProviderTest.java
+++ b/providers/host/src/test/java/org/onosproject/provider/host/impl/HostLocationProviderTest.java
@@ -23,9 +23,17 @@
 import org.onlab.packet.ARP;
 import org.onlab.packet.ChassisId;
 import org.onlab.packet.Ethernet;
+import org.onlab.packet.ICMP6;
+import org.onlab.packet.IPv4;
+import org.onlab.packet.IPv6;
+import org.onlab.packet.Ip6Address;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.VlanId;
+import org.onlab.packet.ndp.NeighborAdvertisement;
+import org.onlab.packet.ndp.NeighborSolicitation;
+import org.onlab.packet.ndp.RouterAdvertisement;
+import org.onlab.packet.ndp.RouterSolicitation;
 import org.onosproject.cfg.ComponentConfigAdapter;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
@@ -66,6 +74,7 @@
 import java.util.Set;
 
 import static org.easymock.EasyMock.*;
+import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.*;
 import static org.onlab.packet.VlanId.vlanId;
 import static org.onosproject.net.Device.Type.SWITCH;
@@ -75,27 +84,42 @@
 import static org.onosproject.net.device.DeviceEvent.Type.*;
 
 public class HostLocationProviderTest {
-
     private static final Integer INPORT = 10;
     private static final String DEV1 = "of:1";
     private static final String DEV2 = "of:2";
     private static final String DEV3 = "of:3";
+    private static final String DEV4 = "of:4";
+    private static final String DEV5 = "of:5";
+    private static final String DEV6 = "of:6";
 
     private static final VlanId VLAN = vlanId();
+
+    // IPv4 Host
     private static final MacAddress MAC = MacAddress.valueOf("00:00:11:00:00:01");
     private static final MacAddress BCMAC = MacAddress.valueOf("ff:ff:ff:ff:ff:ff");
     private static final byte[] IP = new byte[]{10, 0, 0, 1};
-
     private static final IpAddress IP_ADDRESS =
             IpAddress.valueOf(IpAddress.Version.INET, IP);
     private static final HostLocation LOCATION =
             new HostLocation(deviceId(DEV1), portNumber(INPORT), 0L);
-
     private static final DefaultHost HOST =
             new DefaultHost(ProviderId.NONE, hostId(MAC), MAC,
                             vlanId(VlanId.UNTAGGED), LOCATION,
                             ImmutableSet.of(IP_ADDRESS));
 
+    // IPv6 Host
+    private static final MacAddress MAC2 = MacAddress.valueOf("00:00:22:00:00:02");
+    private static final MacAddress BCMAC2 = MacAddress.valueOf("33:33:00:00:00:01");
+    private static final byte[] IP2 = Ip6Address.valueOf("1000::1").toOctets();
+    private static final IpAddress IP_ADDRESS2 =
+            IpAddress.valueOf(IpAddress.Version.INET6, IP2);
+    private static final HostLocation LOCATION2 =
+            new HostLocation(deviceId(DEV4), portNumber(INPORT), 0L);
+    private static final DefaultHost HOST2 =
+            new DefaultHost(ProviderId.NONE, hostId(MAC2), MAC2,
+                            vlanId(VlanId.UNTAGGED), LOCATION2,
+                            ImmutableSet.of(IP_ADDRESS2));
+
     private static final ComponentContextAdapter CTX_FOR_REMOVE =
             new ComponentContextAdapter() {
                 @Override
@@ -157,51 +181,189 @@
     @Test
     public void events() {
         // new host
-        testProcessor.process(new TestPacketContext(DEV1));
+        testProcessor.process(new TestArpPacketContext(DEV1));
         assertNotNull("new host expected", providerService.added);
         assertNull("host motion unexpected", providerService.moved);
 
         // the host moved to new switch
-        testProcessor.process(new TestPacketContext(DEV2));
+        testProcessor.process(new TestArpPacketContext(DEV2));
         assertNotNull("host motion expected", providerService.moved);
 
         // the host was misheard on a spine
-        testProcessor.process(new TestPacketContext(DEV3));
+        testProcessor.process(new TestArpPacketContext(DEV3));
+        assertNull("host misheard on spine switch", providerService.spine);
+
+        providerService.clear();
+
+        // new host
+        testProcessor.process(new TestNAPacketContext(DEV4));
+        assertNotNull("new host expected", providerService.added);
+        assertNull("host motion unexpected", providerService.moved);
+
+        // the host moved to new switch
+        testProcessor.process(new TestNAPacketContext(DEV5));
+        assertNotNull("host motion expected", providerService.moved);
+
+        // the host was misheard on a spine
+        testProcessor.process(new TestNAPacketContext(DEV6));
         assertNull("host misheard on spine switch", providerService.spine);
     }
 
     @Test
     public void removeHostByDeviceRemove() {
         provider.modified(CTX_FOR_REMOVE);
-        testProcessor.process(new TestPacketContext(DEV1));
+        testProcessor.process(new TestArpPacketContext(DEV1));
+        testProcessor.process(new TestNAPacketContext(DEV4));
+
         Device device = new DefaultDevice(ProviderId.NONE, deviceId(DEV1), SWITCH,
                                           "m", "h", "s", "n", new ChassisId(0L));
         deviceService.listener.event(new DeviceEvent(DEVICE_REMOVED, device));
         assertEquals("incorrect remove count", 1, providerService.removeCount);
+
+        device = new DefaultDevice(ProviderId.NONE, deviceId(DEV4), SWITCH,
+                                          "m", "h", "s", "n", new ChassisId(0L));
+        deviceService.listener.event(new DeviceEvent(DEVICE_REMOVED, device));
+        assertEquals("incorrect remove count", 2, providerService.removeCount);
     }
 
     @Test
     public void removeHostByDeviceOffline() {
         provider.modified(CTX_FOR_REMOVE);
-        testProcessor.process(new TestPacketContext(DEV1));
+        testProcessor.process(new TestArpPacketContext(DEV1));
+        testProcessor.process(new TestArpPacketContext(DEV4));
+
         Device device = new DefaultDevice(ProviderId.NONE, deviceId(DEV1), SWITCH,
                                           "m", "h", "s", "n", new ChassisId(0L));
         deviceService.listener.event(new DeviceEvent(DEVICE_AVAILABILITY_CHANGED, device));
         assertEquals("incorrect remove count", 1, providerService.removeCount);
+
+        device = new DefaultDevice(ProviderId.NONE, deviceId(DEV4), SWITCH,
+                                          "m", "h", "s", "n", new ChassisId(0L));
+        deviceService.listener.event(new DeviceEvent(DEVICE_AVAILABILITY_CHANGED, device));
+        assertEquals("incorrect remove count", 2, providerService.removeCount);
     }
 
     @Test
     public void removeHostByDevicePortDown() {
         provider.modified(CTX_FOR_REMOVE);
-        testProcessor.process(new TestPacketContext(DEV1));
+        testProcessor.process(new TestArpPacketContext(DEV1));
+        testProcessor.process(new TestArpPacketContext(DEV4));
+
         Device device = new DefaultDevice(ProviderId.NONE, deviceId(DEV1), SWITCH,
                                           "m", "h", "s", "n", new ChassisId(0L));
         deviceService.listener.event(new DeviceEvent(PORT_UPDATED, device,
-                                                     new DefaultPort(device, portNumber(INPORT),
-                                                                     false)));
+                new DefaultPort(device, portNumber(INPORT), false)));
         assertEquals("incorrect remove count", 1, providerService.removeCount);
+
+        device = new DefaultDevice(ProviderId.NONE, deviceId(DEV4), SWITCH,
+                                          "m", "h", "s", "n", new ChassisId(0L));
+        deviceService.listener.event(new DeviceEvent(PORT_UPDATED, device,
+                new DefaultPort(device, portNumber(INPORT), false)));
+        assertEquals("incorrect remove count", 2, providerService.removeCount);
     }
 
+    /**
+     * When receiving ARP, updates location and IP.
+     */
+    @Test
+    public void testReceiveArp() {
+        testProcessor.process(new TestArpPacketContext(DEV1));
+        HostDescription descr = providerService.added;
+        assertThat(descr.location(), is(LOCATION));
+        assertThat(descr.hwAddress(), is(MAC));
+        assertThat(descr.ipAddress().toArray()[0], is(IP_ADDRESS));
+        assertThat(descr.vlan(), is(VLAN));
+    }
+
+    /**
+     * When receiving IPv4, updates location only.
+     */
+    @Test
+    public void testReceiveIpv4() {
+        testProcessor.process(new TestIpv4PacketContext(DEV1));
+        HostDescription descr = providerService.added;
+        assertThat(descr.location(), is(LOCATION));
+        assertThat(descr.hwAddress(), is(MAC));
+        assertThat(descr.ipAddress().size(), is(0));
+        assertThat(descr.vlan(), is(VLAN));
+    }
+
+    /**
+     * When receiving NeighborAdvertisement, updates location and IP.
+     */
+    @Test
+    public void testReceiveNA() {
+        testProcessor.process(new TestNAPacketContext(DEV4));
+        assertNotNull(providerService.added);
+        HostDescription descr = providerService.added;
+        assertThat(descr.location(), is(LOCATION2));
+        assertThat(descr.hwAddress(), is(MAC2));
+        assertThat(descr.ipAddress().toArray()[0], is(IP_ADDRESS2));
+        assertThat(descr.vlan(), is(VLAN));
+    }
+
+    /**
+     * When receiving NeighborSolicitation, updates location and IP.
+     */
+    @Test
+    public void testReceiveNS() {
+        testProcessor.process(new TestNSPacketContext(DEV4));
+        HostDescription descr = providerService.added;
+        assertThat(descr.location(), is(LOCATION2));
+        assertThat(descr.hwAddress(), is(MAC2));
+        assertThat(descr.ipAddress().toArray()[0], is(IP_ADDRESS2));
+        assertThat(descr.vlan(), is(VLAN));
+    }
+
+    /**
+     * When receiving RouterAdvertisement, ignores it.
+     */
+    @Test
+    public void testReceivesRA() {
+        testProcessor.process(new TestRAPacketContext(DEV4));
+        assertNull(providerService.added);
+    }
+
+    /**
+     * When receiving RouterSolicitation, ignores it.
+     */
+    @Test
+    public void testReceiveRS() {
+        testProcessor.process(new TestRSPacketContext(DEV4));
+        assertNull(providerService.added);
+    }
+
+    /**
+     * When receiving Duplicate Address Detection (DAD), ignores it.
+     */
+    @Test
+    public void testReceiveDAD() {
+        testProcessor.process(new TestDADPacketContext(DEV4));
+        assertNull(providerService.added);
+    }
+
+    /**
+     * When receiving IPv6 multicast packet, ignores it.
+     */
+    @Test
+    public void testReceiveIpv6Multicast() {
+        testProcessor.process(new TestIpv6McastPacketContext(DEV4));
+        assertNull(providerService.added);
+    }
+
+    /**
+     * When receiving IPv6 unicast packet, updates location only.
+     */
+    @Test
+    public void testReceiveIpv6Unicast() {
+        testProcessor.process(new TestIpv6PacketContext(DEV4));
+        assertNotNull(providerService.added);
+        HostDescription descr = providerService.added;
+        assertThat(descr.location(), is(LOCATION2));
+        assertThat(descr.hwAddress(), is(MAC2));
+        assertThat(descr.ipAddress().size(), is(0));
+        assertThat(descr.vlan(), is(VLAN));
+    }
 
     @After
     public void tearDown() {
@@ -233,24 +395,30 @@
             extends AbstractProviderService<HostProvider>
             implements HostProviderService {
 
-        DeviceId added = null;
-        DeviceId moved = null;
-        DeviceId spine = null;
+        HostDescription added = null;
+        HostDescription moved = null;
+        HostDescription spine = null;
         public int removeCount;
 
+        public void clear() {
+            added = null;
+            moved = null;
+            spine = null;
+            removeCount = 0;
+        }
+
         protected TestHostProviderService(HostProvider provider) {
             super(provider);
         }
 
         @Override
         public void hostDetected(HostId hostId, HostDescription hostDescription, boolean replaceIps) {
-            DeviceId descr = hostDescription.location().deviceId();
             if (added == null) {
-                added = descr;
-            } else if ((moved == null) && !descr.equals(added)) {
-                moved = descr;
+                added = hostDescription;
+            } else if ((moved == null) && !hostDescription.equals(added)) {
+                moved = hostDescription;
             } else {
-                spine = descr;
+                spine = hostDescription;
             }
         }
 
@@ -272,24 +440,26 @@
         }
     }
 
-
     private class TestTopologyService extends TopologyServiceAdapter {
         @Override
         public boolean isInfrastructure(Topology topology,
                                         ConnectPoint connectPoint) {
             //simulate DPID3 as an infrastructure switch
-            if ((connectPoint.deviceId()).equals(deviceId(DEV3))) {
+            if ((connectPoint.deviceId()).equals(deviceId(DEV3)) ||
+                    connectPoint.deviceId().equals(deviceId(DEV6))) {
                 return true;
             }
             return false;
         }
     }
 
-    private class TestPacketContext implements PacketContext {
-
+    /**
+     * Generates ARP packet.
+     */
+    private class TestArpPacketContext implements PacketContext {
         private final String deviceId;
 
-        public TestPacketContext(String deviceId) {
+        public TestArpPacketContext(String deviceId) {
             this.deviceId = deviceId;
         }
 
@@ -344,6 +514,490 @@
         }
     }
 
+    /**
+     * Generates IPv6 Unicast packet.
+     */
+    private class TestIpv4PacketContext implements PacketContext {
+        private final String deviceId;
+
+        public TestIpv4PacketContext(String deviceId) {
+            this.deviceId = deviceId;
+        }
+
+        @Override
+        public long time() {
+            return 0;
+        }
+
+        @Override
+        public InboundPacket inPacket() {
+            IPv4 ipv4 = new IPv4();
+            ipv4.setDestinationAddress("10.0.0.1");
+            ipv4.setSourceAddress(IP_ADDRESS.toString());
+            Ethernet eth = new Ethernet();
+            eth.setEtherType(Ethernet.TYPE_IPV4)
+                    .setVlanID(VLAN.toShort())
+                    .setSourceMACAddress(MAC)
+                    .setDestinationMACAddress(MacAddress.valueOf("00:00:00:00:00:01"))
+                    .setPayload(ipv4);
+            ConnectPoint receivedFrom = new ConnectPoint(deviceId(deviceId),
+                                                         portNumber(INPORT));
+            return new DefaultInboundPacket(receivedFrom, eth,
+                                            ByteBuffer.wrap(eth.serialize()));
+        }
+
+        @Override
+        public OutboundPacket outPacket() {
+            return null;
+        }
+
+        @Override
+        public TrafficTreatment.Builder treatmentBuilder() {
+            return null;
+        }
+
+        @Override
+        public void send() {
+
+        }
+
+        @Override
+        public boolean block() {
+            return false;
+        }
+
+        @Override
+        public boolean isHandled() {
+            return false;
+        }
+    }
+
+    /**
+     * Generates NeighborAdvertisement packet.
+     */
+    private class TestNAPacketContext implements PacketContext {
+        private final String deviceId;
+
+        public TestNAPacketContext(String deviceId) {
+            this.deviceId = deviceId;
+        }
+
+        @Override
+        public long time() {
+            return 0;
+        }
+
+        @Override
+        public InboundPacket inPacket() {
+            NeighborAdvertisement na = new NeighborAdvertisement();
+            ICMP6 icmp6 = new ICMP6();
+            icmp6.setPayload(na);
+            IPv6 ipv6 = new IPv6();
+            ipv6.setPayload(icmp6);
+            ipv6.setDestinationAddress(Ip6Address.valueOf("ff02::1").toOctets());
+            ipv6.setSourceAddress(IP2);
+            Ethernet eth = new Ethernet();
+            eth.setEtherType(Ethernet.TYPE_IPV6)
+                    .setVlanID(VLAN.toShort())
+                    .setSourceMACAddress(MAC2.toBytes())
+                    .setDestinationMACAddress(BCMAC2)
+                    .setPayload(ipv6);
+            ConnectPoint receivedFrom = new ConnectPoint(deviceId(deviceId),
+                                                         portNumber(INPORT));
+            return new DefaultInboundPacket(receivedFrom, eth,
+                                            ByteBuffer.wrap(eth.serialize()));
+        }
+
+        @Override
+        public OutboundPacket outPacket() {
+            return null;
+        }
+
+        @Override
+        public TrafficTreatment.Builder treatmentBuilder() {
+            return null;
+        }
+
+        @Override
+        public void send() {
+
+        }
+
+        @Override
+        public boolean block() {
+            return false;
+        }
+
+        @Override
+        public boolean isHandled() {
+            return false;
+        }
+    }
+
+    /**
+     * Generates NeighborSolicitation packet.
+     */
+    private class TestNSPacketContext implements PacketContext {
+        private final String deviceId;
+
+        public TestNSPacketContext(String deviceId) {
+            this.deviceId = deviceId;
+        }
+
+        @Override
+        public long time() {
+            return 0;
+        }
+
+        @Override
+        public InboundPacket inPacket() {
+            NeighborSolicitation ns = new NeighborSolicitation();
+            ICMP6 icmp6 = new ICMP6();
+            icmp6.setPayload(ns);
+            IPv6 ipv6 = new IPv6();
+            ipv6.setPayload(icmp6);
+            ipv6.setDestinationAddress(Ip6Address.valueOf("ff02::1:ff00:0000").toOctets());
+            ipv6.setSourceAddress(IP2);
+            Ethernet eth = new Ethernet();
+            eth.setEtherType(Ethernet.TYPE_IPV6)
+                    .setVlanID(VLAN.toShort())
+                    .setSourceMACAddress(MAC2.toBytes())
+                    .setDestinationMACAddress(BCMAC2)
+                    .setPayload(ipv6);
+            ConnectPoint receivedFrom = new ConnectPoint(deviceId(deviceId),
+                                                         portNumber(INPORT));
+            return new DefaultInboundPacket(receivedFrom, eth,
+                                            ByteBuffer.wrap(eth.serialize()));
+        }
+
+        @Override
+        public OutboundPacket outPacket() {
+            return null;
+        }
+
+        @Override
+        public TrafficTreatment.Builder treatmentBuilder() {
+            return null;
+        }
+
+        @Override
+        public void send() {
+
+        }
+
+        @Override
+        public boolean block() {
+            return false;
+        }
+
+        @Override
+        public boolean isHandled() {
+            return false;
+        }
+    }
+
+    /**
+     * Generates Duplicate Address Detection packet.
+     */
+    private class TestDADPacketContext implements PacketContext {
+        private final String deviceId;
+
+        public TestDADPacketContext(String deviceId) {
+            this.deviceId = deviceId;
+        }
+
+        @Override
+        public long time() {
+            return 0;
+        }
+
+        @Override
+        public InboundPacket inPacket() {
+            NeighborSolicitation ns = new NeighborSolicitation();
+            ICMP6 icmp6 = new ICMP6();
+            icmp6.setPayload(ns);
+            IPv6 ipv6 = new IPv6();
+            ipv6.setPayload(icmp6);
+            ipv6.setDestinationAddress(Ip6Address.valueOf("ff02::1").toOctets());
+            ipv6.setSourceAddress(Ip6Address.valueOf("::").toOctets());
+            Ethernet eth = new Ethernet();
+            eth.setEtherType(Ethernet.TYPE_IPV6)
+                    .setVlanID(VLAN.toShort())
+                    .setSourceMACAddress(MAC2.toBytes())
+                    .setDestinationMACAddress(BCMAC2)
+                    .setPayload(ipv6);
+            ConnectPoint receivedFrom = new ConnectPoint(deviceId(deviceId),
+                                                         portNumber(INPORT));
+            return new DefaultInboundPacket(receivedFrom, eth,
+                                            ByteBuffer.wrap(eth.serialize()));
+        }
+
+        @Override
+        public OutboundPacket outPacket() {
+            return null;
+        }
+
+        @Override
+        public TrafficTreatment.Builder treatmentBuilder() {
+            return null;
+        }
+
+        @Override
+        public void send() {
+
+        }
+
+        @Override
+        public boolean block() {
+            return false;
+        }
+
+        @Override
+        public boolean isHandled() {
+            return false;
+        }
+    }
+
+    /**
+     * Generates Router Solicitation packet.
+     */
+    private class TestRSPacketContext implements PacketContext {
+        private final String deviceId;
+
+        public TestRSPacketContext(String deviceId) {
+            this.deviceId = deviceId;
+        }
+
+        @Override
+        public long time() {
+            return 0;
+        }
+
+        @Override
+        public InboundPacket inPacket() {
+            RouterSolicitation ns = new RouterSolicitation();
+            ICMP6 icmp6 = new ICMP6();
+            icmp6.setPayload(ns);
+            IPv6 ipv6 = new IPv6();
+            ipv6.setPayload(icmp6);
+            ipv6.setDestinationAddress(Ip6Address.valueOf("ff02::2").toOctets());
+            ipv6.setSourceAddress(Ip6Address.valueOf("::").toOctets());
+            Ethernet eth = new Ethernet();
+            eth.setEtherType(Ethernet.TYPE_IPV6)
+                    .setVlanID(VLAN.toShort())
+                    .setSourceMACAddress(MAC2.toBytes())
+                    .setDestinationMACAddress(MacAddress.valueOf("33:33:00:00:00:02"))
+                    .setPayload(ipv6);
+            ConnectPoint receivedFrom = new ConnectPoint(deviceId(deviceId),
+                                                         portNumber(INPORT));
+            return new DefaultInboundPacket(receivedFrom, eth,
+                                            ByteBuffer.wrap(eth.serialize()));
+        }
+
+        @Override
+        public OutboundPacket outPacket() {
+            return null;
+        }
+
+        @Override
+        public TrafficTreatment.Builder treatmentBuilder() {
+            return null;
+        }
+
+        @Override
+        public void send() {
+
+        }
+
+        @Override
+        public boolean block() {
+            return false;
+        }
+
+        @Override
+        public boolean isHandled() {
+            return false;
+        }
+    }
+
+    /**
+     * Generates Router Advertisement packet.
+     */
+    private class TestRAPacketContext implements PacketContext {
+        private final String deviceId;
+
+        public TestRAPacketContext(String deviceId) {
+            this.deviceId = deviceId;
+        }
+
+        @Override
+        public long time() {
+            return 0;
+        }
+
+        @Override
+        public InboundPacket inPacket() {
+            RouterAdvertisement ns = new RouterAdvertisement();
+            ICMP6 icmp6 = new ICMP6();
+            icmp6.setPayload(ns);
+            IPv6 ipv6 = new IPv6();
+            ipv6.setPayload(icmp6);
+            ipv6.setDestinationAddress(Ip6Address.valueOf("ff02::1").toOctets());
+            ipv6.setSourceAddress(IP2);
+            Ethernet eth = new Ethernet();
+            eth.setEtherType(Ethernet.TYPE_IPV6)
+                    .setVlanID(VLAN.toShort())
+                    .setSourceMACAddress(MAC2.toBytes())
+                    .setDestinationMACAddress(MacAddress.valueOf("33:33:00:00:00:01"))
+                    .setPayload(ipv6);
+            ConnectPoint receivedFrom = new ConnectPoint(deviceId(deviceId),
+                                                         portNumber(INPORT));
+            return new DefaultInboundPacket(receivedFrom, eth,
+                                            ByteBuffer.wrap(eth.serialize()));
+        }
+
+        @Override
+        public OutboundPacket outPacket() {
+            return null;
+        }
+
+        @Override
+        public TrafficTreatment.Builder treatmentBuilder() {
+            return null;
+        }
+
+        @Override
+        public void send() {
+
+        }
+
+        @Override
+        public boolean block() {
+            return false;
+        }
+
+        @Override
+        public boolean isHandled() {
+            return false;
+        }
+    }
+
+    /**
+     * Generates IPv6 Multicast packet.
+     */
+    private class TestIpv6McastPacketContext implements PacketContext {
+        private final String deviceId;
+
+        public TestIpv6McastPacketContext(String deviceId) {
+            this.deviceId = deviceId;
+        }
+
+        @Override
+        public long time() {
+            return 0;
+        }
+
+        @Override
+        public InboundPacket inPacket() {
+            IPv6 ipv6 = new IPv6();
+            ipv6.setDestinationAddress(Ip6Address.valueOf("ff02::1").toOctets());
+            ipv6.setSourceAddress(IP2);
+            Ethernet eth = new Ethernet();
+            eth.setEtherType(Ethernet.TYPE_IPV6)
+                    .setVlanID(VLAN.toShort())
+                    .setSourceMACAddress(MAC2.toBytes())
+                    .setDestinationMACAddress(MacAddress.valueOf("33:33:00:00:00:01"))
+                    .setPayload(ipv6);
+            ConnectPoint receivedFrom = new ConnectPoint(deviceId(deviceId),
+                                                         portNumber(INPORT));
+            return new DefaultInboundPacket(receivedFrom, eth,
+                                            ByteBuffer.wrap(eth.serialize()));
+        }
+
+        @Override
+        public OutboundPacket outPacket() {
+            return null;
+        }
+
+        @Override
+        public TrafficTreatment.Builder treatmentBuilder() {
+            return null;
+        }
+
+        @Override
+        public void send() {
+
+        }
+
+        @Override
+        public boolean block() {
+            return false;
+        }
+
+        @Override
+        public boolean isHandled() {
+            return false;
+        }
+    }
+
+    /**
+     * Generates IPv6 Unicast packet.
+     */
+    private class TestIpv6PacketContext implements PacketContext {
+        private final String deviceId;
+
+        public TestIpv6PacketContext(String deviceId) {
+            this.deviceId = deviceId;
+        }
+
+        @Override
+        public long time() {
+            return 0;
+        }
+
+        @Override
+        public InboundPacket inPacket() {
+            IPv6 ipv6 = new IPv6();
+            ipv6.setDestinationAddress(Ip6Address.valueOf("1000::1").toOctets());
+            ipv6.setSourceAddress(IP2);
+            Ethernet eth = new Ethernet();
+            eth.setEtherType(Ethernet.TYPE_IPV6)
+                    .setVlanID(VLAN.toShort())
+                    .setSourceMACAddress(MAC2)
+                    .setDestinationMACAddress(MacAddress.valueOf("00:00:00:00:00:01"))
+                    .setPayload(ipv6);
+            ConnectPoint receivedFrom = new ConnectPoint(deviceId(deviceId),
+                                                         portNumber(INPORT));
+            return new DefaultInboundPacket(receivedFrom, eth,
+                                            ByteBuffer.wrap(eth.serialize()));
+        }
+
+        @Override
+        public OutboundPacket outPacket() {
+            return null;
+        }
+
+        @Override
+        public TrafficTreatment.Builder treatmentBuilder() {
+            return null;
+        }
+
+        @Override
+        public void send() {
+
+        }
+
+        @Override
+        public boolean block() {
+            return false;
+        }
+
+        @Override
+        public boolean isHandled() {
+            return false;
+        }
+    }
+
     private class TestDeviceService extends DeviceServiceAdapter {
         private DeviceListener listener;
 
@@ -361,12 +1015,26 @@
     private class TestHostService extends HostServiceAdapter {
         @Override
         public Set<Host> getConnectedHosts(ConnectPoint connectPoint) {
-            return ImmutableSet.of(HOST);
+            ConnectPoint cp1 = new ConnectPoint(deviceId(DEV1), portNumber(INPORT));
+            ConnectPoint cp2 = new ConnectPoint(deviceId(DEV4), portNumber(INPORT));
+            if (connectPoint.equals(cp1)) {
+                return ImmutableSet.of(HOST);
+            } else if (connectPoint.equals(cp2)) {
+                return ImmutableSet.of(HOST2);
+            } else {
+                return ImmutableSet.of();
+            }
         }
 
         @Override
         public Set<Host> getConnectedHosts(DeviceId deviceId) {
-            return ImmutableSet.of(HOST);
+            if (deviceId.equals(deviceId(DEV1))) {
+                return ImmutableSet.of(HOST);
+            } else if (deviceId.equals(deviceId(DEV4))) {
+                return ImmutableSet.of(HOST2);
+            } else {
+                return ImmutableSet.of();
+            }
         }
 
     }