ONOS-5236 - Adapt SDN-IP to the new intent framework APIs

Change-Id: I89b60602247a25a1879e4394a60c57d480881f74

@@ -21,6 +21,8 @@ import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.onlab.packet.Ethernet;
+import org.onlab.packet.VlanId;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
 import org.onosproject.core.CoreService;
 import org.onosproject.incubator.net.intf.Interface;
 import org.onosproject.incubator.net.intf.Interface;
@@ -42,8 +44,6 @@ import org.onosproject.routing.config.BgpConfig;
 import java.util.HashSet;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.Set;
 
 
-import static org.onosproject.net.HostId.hostId;
-
 /**
 /**
  * Manages neighbour message handlers for the use case of internal BGP speakers
  * Manages neighbour message handlers for the use case of internal BGP speakers
  * connected to the network at some point that are exchanging neighbour
  * connected to the network at some point that are exchanging neighbour
@@ -154,11 +154,18 @@ public class BgpSpeakerNeighbourHandler {
             case REPLY:
             case REPLY:
                 // Proxy replies over to our internal BGP speaker if the host
                 // Proxy replies over to our internal BGP speaker if the host
                 // is known to us
                 // is known to us
-                Host h = hostService.getHost(hostId(context.dstMac(), context.vlan()));
-
+                Host h = hostService.getHostsByMac(context.dstMac()).stream()
+                                                                    .findFirst()
+                                                                    .get();
                 if (h == null) {
                 if (h == null) {
                     context.drop();
                     context.drop();
                 } else {
                 } else {
+                    VlanId bgpSpeakerVlanId = h.vlan();
+                    if (!bgpSpeakerVlanId.equals(VlanId.NONE)) {
+                        context.packet().setVlanID(bgpSpeakerVlanId.toShort());
+                    } else {
+                        context.packet().setVlanID(Ethernet.VLAN_UNTAGGED);
+                    }
                     context.forward(h.location());
                     context.forward(h.location());
                 }
                 }
                 break;
                 break;
@@ -179,9 +186,6 @@ public class BgpSpeakerNeighbourHandler {
             // For messages coming from a BGP speaker, look at the sender address
             // For messages coming from a BGP speaker, look at the sender address
             // to find the interface to proxy to
             // to find the interface to proxy to
             interfaceService.getInterfacesByIp(context.sender())
             interfaceService.getInterfacesByIp(context.sender())
-                    .stream()
-                    .filter(intf -> intf.vlan().equals(context.vlan()))
-                    .map(intf -> intf.connectPoint())
                     .forEach(context::forward);
                     .forEach(context::forward);
         }
         }
     }
     }

@@ -239,16 +239,9 @@ public class PeerConnectivityManager {
         }
         }
 
 
         // Add VLAN treatment for traffic going from BGP speaker to BGP peer
         // Add VLAN treatment for traffic going from BGP speaker to BGP peer
-        if (!vlanOne.equals(vlanTwo)) {
-            if (vlanTwo.equals(VlanId.NONE)) {
-                treatmentToPeer.popVlan();
-            } else {
-                treatmentToPeer.setVlanId(vlanTwo);
-            }
-        }
+        treatmentToPeer = applyVlanTreatment(vlanOne, vlanTwo, treatmentToPeer);
 
 
         // Path from BGP speaker to BGP peer matching destination TCP port 179
         // Path from BGP speaker to BGP peer matching destination TCP port 179
-
         selector = buildSelector(tcpProtocol,
         selector = buildSelector(tcpProtocol,
                 vlanOne,
                 vlanOne,
                 ipOne,
                 ipOne,
@@ -309,13 +302,7 @@ public class PeerConnectivityManager {
                             .build());
                             .build());
 
 
         // Add VLAN treatment for traffic going from BGP peer to BGP speaker
         // Add VLAN treatment for traffic going from BGP peer to BGP speaker
-        if (!vlanTwo.equals(vlanOne)) {
-            if (vlanOne.equals(VlanId.NONE)) {
-                treatmentToSpeaker.popVlan();
-            } else {
-                treatmentToSpeaker.setVlanId(vlanOne);
-            }
-        }
+        treatmentToSpeaker = applyVlanTreatment(vlanTwo, vlanOne, treatmentToSpeaker);
 
 
         // Path from BGP peer to BGP speaker matching destination TCP port 179
         // Path from BGP peer to BGP speaker matching destination TCP port 179
         selector = buildSelector(tcpProtocol,
         selector = buildSelector(tcpProtocol,
@@ -396,9 +383,9 @@ public class PeerConnectivityManager {
                                           Short dstTcpPort) {
                                           Short dstTcpPort) {
         TrafficSelector.Builder builder = DefaultTrafficSelector.builder().matchIPProtocol(ipProto);
         TrafficSelector.Builder builder = DefaultTrafficSelector.builder().matchIPProtocol(ipProto);
 
 
-        // Match on any VLAN Id if a VLAN Id configured on the ingress interface
+        // Match on VLAN Id if a VLAN Id configured on the ingress interface
         if (!ingressVlanId.equals(VlanId.NONE)) {
         if (!ingressVlanId.equals(VlanId.NONE)) {
-            builder.matchVlanId(VlanId.ANY);
+            builder.matchVlanId(ingressVlanId);
         }
         }
 
 
         if (dstIp.isIp4()) {
         if (dstIp.isIp4()) {
@@ -422,6 +409,31 @@ public class PeerConnectivityManager {
         return builder.build();
         return builder.build();
     }
     }
 
 
+    /*
+     * Adds the VLAN Id treatment before building the intents, depending on how
+     * the VLAN Ids of the BGP speakers and the BGP peers are configured.
+     */
+    private TrafficTreatment.Builder applyVlanTreatment(VlanId vlanOne,
+                                                        VlanId vlanTwo,
+                                                        TrafficTreatment.Builder treatment) {
+        if (!vlanOne.equals(vlanTwo)) {
+            // VLANs are different. Do some VLAN treatment
+            if (vlanTwo.equals(VlanId.NONE)) {
+                // VLAN two is none. VLAN one is set. Do a pop
+                treatment.popVlan();
+            } else {
+                // Either both VLANs are set or vlanOne is not
+                if (vlanOne.equals(VlanId.NONE)) {
+                    // VLAN one is none. VLAN two is set. Push the VLAN header
+                    treatment.pushVlan();
+                }
+                // Set the VLAN Id to the egress VLAN Id
+                treatment.setVlanId(vlanTwo);
+            }
+        }
+        return treatment;
+    }
+
     /**
     /**
      * Builds an intent Key for a point-to-point intent based off the source
      * Builds an intent Key for a point-to-point intent based off the source
      * and destination IP address, as well as a suffix String to distinguish
      * and destination IP address, as well as a suffix String to distinguish

@@ -316,7 +316,7 @@ public class PeerConnectivityManagerTest extends AbstractIntentTest {
                 .matchIPDst(IpPrefix.valueOf(dstPrefix));
                 .matchIPDst(IpPrefix.valueOf(dstPrefix));
 
 
         if (!srcVlanId.equals(VlanId.NONE)) {
         if (!srcVlanId.equals(VlanId.NONE)) {
-            builder.matchVlanId(VlanId.ANY);
+            builder.matchVlanId(srcVlanId);
         }
         }
 
 
         TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder();
         TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder();
@@ -495,7 +495,7 @@ public class PeerConnectivityManagerTest extends AbstractIntentTest {
                 .matchIPDst(IpPrefix.valueOf(dstPrefix));
                 .matchIPDst(IpPrefix.valueOf(dstPrefix));
 
 
         if (!srcVlanId.equals(VlanId.NONE)) {
         if (!srcVlanId.equals(VlanId.NONE)) {
-            builder.matchVlanId(VlanId.ANY);
+            builder.matchVlanId(srcVlanId);
         }
         }
 
 
         TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder();
         TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder();

-/*
- * Copyright 2016-present Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onosproject.sdnip;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import org.junit.Before;
-import org.junit.Test;
-import org.onlab.packet.Ethernet;
-import org.onlab.packet.Ip4Address;
-import org.onlab.packet.Ip4Prefix;
-import org.onlab.packet.IpPrefix;
-import org.onlab.packet.MacAddress;
-import org.onlab.packet.VlanId;
-import org.onosproject.TestApplicationId;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.core.CoreServiceAdapter;
-import org.onosproject.incubator.net.intf.Interface;
-import org.onosproject.incubator.net.intf.InterfaceListener;
-import org.onosproject.incubator.net.intf.InterfaceService;
-import org.onosproject.incubator.net.intf.InterfaceServiceAdapter;
-import org.onosproject.incubator.net.routing.ResolvedRoute;
-import org.onosproject.incubator.net.routing.RouteEvent;
-import org.onosproject.incubator.net.routing.RouteListener;
-import org.onosproject.incubator.net.routing.RouteServiceAdapter;
-import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.flow.DefaultTrafficSelector;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.TrafficTreatment;
-import org.onosproject.net.host.InterfaceIpAddress;
-import org.onosproject.net.intent.AbstractIntentTest;
-import org.onosproject.net.intent.Key;
-import org.onosproject.net.intent.MultiPointToSinglePointIntent;
-import org.onosproject.routing.IntentSynchronizationService;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.easymock.EasyMock.*;
-import static org.onosproject.routing.TestIntentServiceHelper.eqExceptId;
-
-/**
- * Unit tests for SdnIpFib.
- */
-public class SdnIpFibNoVlanstoVlanTest extends AbstractIntentTest {
-
-    private InterfaceService interfaceService;
-
-    private static final ConnectPoint SW1_ETH1 = new ConnectPoint(
-            DeviceId.deviceId("of:0000000000000001"),
-            PortNumber.portNumber(1));
-
-    private static final ConnectPoint SW2_ETH1 = new ConnectPoint(
-            DeviceId.deviceId("of:0000000000000002"),
-            PortNumber.portNumber(1));
-
-    private static final ConnectPoint SW3_ETH1 = new ConnectPoint(
-            DeviceId.deviceId("of:0000000000000003"),
-            PortNumber.portNumber(1));
-
-    private static final IpPrefix PREFIX1 = Ip4Prefix.valueOf("1.1.1.0/24");
-
-    private SdnIpFib sdnipFib;
-    private IntentSynchronizationService intentSynchronizer;
-    private final Set<Interface> interfaces = Sets.newHashSet();
-
-    private static final ApplicationId APPID = TestApplicationId.create("SDNIP");
-
-    private RouteListener routeListener;
-    private InterfaceListener interfaceListener;
-
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-
-        interfaceService = createMock(InterfaceService.class);
-
-        interfaceService.addListener(anyObject(InterfaceListener.class));
-        expectLastCall().andDelegateTo(new InterfaceServiceDelegate());
-
-        // These will set expectations on routingConfig and interfaceService
-        setUpInterfaceService();
-
-        replay(interfaceService);
-
-        intentSynchronizer = createMock(IntentSynchronizationService.class);
-
-        sdnipFib = new SdnIpFib();
-        sdnipFib.routeService = new TestRouteService();
-        sdnipFib.coreService = new TestCoreService();
-        sdnipFib.interfaceService = interfaceService;
-        sdnipFib.intentSynchronizer = intentSynchronizer;
-
-        sdnipFib.activate();
-    }
-
-    /**
-     * Sets up the interface service.
-     */
-    private void setUpInterfaceService() {
-        List<InterfaceIpAddress> interfaceIpAddresses1 = Lists.newArrayList();
-        interfaceIpAddresses1.add(InterfaceIpAddress.valueOf("192.168.10.101/24"));
-        Interface sw1Eth1 = new Interface("sw1-eth1", SW1_ETH1,
-                                          interfaceIpAddresses1, MacAddress.valueOf("00:00:00:00:00:01"),
-                                          VlanId.NONE);
-        interfaces.add(sw1Eth1);
-
-        List<InterfaceIpAddress> interfaceIpAddresses2 = Lists.newArrayList();
-        interfaceIpAddresses2.add(InterfaceIpAddress.valueOf("192.168.20.101/24"));
-        Interface sw2Eth1 = new Interface("sw2-eth1", SW2_ETH1,
-                                          interfaceIpAddresses2, MacAddress.valueOf("00:00:00:00:00:02"),
-                                          VlanId.NONE);
-        interfaces.add(sw2Eth1);
-
-        InterfaceIpAddress interfaceIpAddress3 = InterfaceIpAddress.valueOf("192.168.30.101/24");
-        Interface sw3Eth1 = new Interface("sw3-eth1", SW3_ETH1,
-                                          Lists.newArrayList(interfaceIpAddress3),
-                                          MacAddress.valueOf("00:00:00:00:00:03"),
-                                          VlanId.vlanId((short) 1));
-        interfaces.add(sw3Eth1);
-
-        expect(interfaceService.getInterfacesByPort(SW1_ETH1)).andReturn(
-                Collections.singleton(sw1Eth1)).anyTimes();
-        expect(interfaceService.getMatchingInterface(Ip4Address.valueOf("192.168.10.1")))
-                .andReturn(sw1Eth1).anyTimes();
-        expect(interfaceService.getInterfacesByPort(SW2_ETH1)).andReturn(
-                Collections.singleton(sw2Eth1)).anyTimes();
-        expect(interfaceService.getMatchingInterface(Ip4Address.valueOf("192.168.20.1")))
-                .andReturn(sw2Eth1).anyTimes();
-        expect(interfaceService.getInterfacesByPort(SW3_ETH1)).andReturn(
-                Collections.singleton(sw3Eth1)).anyTimes();
-        expect(interfaceService.getMatchingInterface(Ip4Address.valueOf("192.168.30.1")))
-                .andReturn(sw3Eth1).anyTimes();
-        expect(interfaceService.getInterfaces()).andReturn(interfaces).anyTimes();
-    }
-
-    /**
-     * Tests adding a route. Ingresses with no VLAN and next hop with VLAN.
-     *
-     * We verify that the synchronizer records the correct state and that the
-     * correct intent is submitted to the IntentService.
-     */
-    @Test
-    public void testRouteAdd() {
-        ResolvedRoute route = new ResolvedRoute(PREFIX1,
-                Ip4Address.valueOf("192.168.30.1"),
-                MacAddress.valueOf("00:00:00:00:00:03"));
-
-        // Construct a MultiPointToSinglePointIntent intent
-        TrafficSelector.Builder selectorBuilder =
-                DefaultTrafficSelector.builder();
-        selectorBuilder.matchEthType(Ethernet.TYPE_IPV4)
-                .matchIPDst(PREFIX1);
-
-        TrafficTreatment.Builder treatmentBuilder =
-                DefaultTrafficTreatment.builder();
-        treatmentBuilder.setEthDst(MacAddress.valueOf("00:00:00:00:00:03"))
-                .setVlanId(VlanId.vlanId((short) 1));
-
-        Set<ConnectPoint> ingressPoints = new HashSet<>();
-        ingressPoints.add(SW1_ETH1);
-        ingressPoints.add(SW2_ETH1);
-
-        MultiPointToSinglePointIntent intent =
-                MultiPointToSinglePointIntent.builder()
-                        .appId(APPID)
-                        .key(Key.of(PREFIX1.toString(), APPID))
-                        .selector(selectorBuilder.build())
-                        .treatment(treatmentBuilder.build())
-                        .ingressPoints(ingressPoints)
-                        .egressPoint(SW3_ETH1)
-                        .constraints(SdnIpFib.CONSTRAINTS)
-                        .build();
-
-        // Setup the expected intents
-        intentSynchronizer.submit(eqExceptId(intent));
-
-        replay(intentSynchronizer);
-
-        // Send in the added event
-        routeListener.event(new RouteEvent(RouteEvent.Type.ROUTE_ADDED, route));
-
-        verify(intentSynchronizer);
-    }
-
-    private class TestCoreService extends CoreServiceAdapter {
-        @Override
-        public ApplicationId getAppId(String name) {
-            return APPID;
-        }
-    }
-
-    private class TestRouteService extends RouteServiceAdapter {
-        @Override
-        public void addListener(RouteListener routeListener) {
-            SdnIpFibNoVlanstoVlanTest.this.routeListener = routeListener;
-        }
-    }
-
-    private class InterfaceServiceDelegate extends InterfaceServiceAdapter {
-        @Override
-        public void addListener(InterfaceListener listener) {
-            SdnIpFibNoVlanstoVlanTest.this.interfaceListener = listener;
-        }
-    }
-}

-/*
- * Copyright 2016-present Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onosproject.sdnip;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import org.junit.Before;
-import org.junit.Test;
-import org.onlab.packet.Ethernet;
-import org.onlab.packet.Ip4Address;
-import org.onlab.packet.Ip4Prefix;
-import org.onlab.packet.IpPrefix;
-import org.onlab.packet.MacAddress;
-import org.onlab.packet.VlanId;
-import org.onosproject.TestApplicationId;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.core.CoreServiceAdapter;
-import org.onosproject.incubator.net.intf.Interface;
-import org.onosproject.incubator.net.intf.InterfaceListener;
-import org.onosproject.incubator.net.intf.InterfaceService;
-import org.onosproject.incubator.net.intf.InterfaceServiceAdapter;
-import org.onosproject.incubator.net.routing.ResolvedRoute;
-import org.onosproject.incubator.net.routing.RouteEvent;
-import org.onosproject.incubator.net.routing.RouteListener;
-import org.onosproject.incubator.net.routing.RouteServiceAdapter;
-import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.flow.DefaultTrafficSelector;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.TrafficTreatment;
-import org.onosproject.net.host.InterfaceIpAddress;
-import org.onosproject.net.intent.AbstractIntentTest;
-import org.onosproject.net.intent.Key;
-import org.onosproject.net.intent.MultiPointToSinglePointIntent;
-import org.onosproject.routing.IntentSynchronizationService;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.easymock.EasyMock.*;
-import static org.onosproject.routing.TestIntentServiceHelper.eqExceptId;
-
-/**
- * Unit tests for SdnIpFib.
- */
-public class SdnIpFibVlansToVlanDifferentTest extends AbstractIntentTest {
-
-    private InterfaceService interfaceService;
-
-    private static final ConnectPoint SW1_ETH1 = new ConnectPoint(
-            DeviceId.deviceId("of:0000000000000001"),
-            PortNumber.portNumber(1));
-
-    private static final ConnectPoint SW2_ETH1 = new ConnectPoint(
-            DeviceId.deviceId("of:0000000000000002"),
-            PortNumber.portNumber(1));
-
-    private static final ConnectPoint SW3_ETH1 = new ConnectPoint(
-            DeviceId.deviceId("of:0000000000000003"),
-            PortNumber.portNumber(1));
-
-    private static final IpPrefix PREFIX1 = Ip4Prefix.valueOf("1.1.1.0/24");
-
-    private SdnIpFib sdnipFib;
-    private IntentSynchronizationService intentSynchronizer;
-    private final Set<Interface> interfaces = Sets.newHashSet();
-
-    private static final ApplicationId APPID = TestApplicationId.create("SDNIP");
-
-    private RouteListener routeListener;
-    private InterfaceListener interfaceListener;
-
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-
-        interfaceService = createMock(InterfaceService.class);
-
-        interfaceService.addListener(anyObject(InterfaceListener.class));
-        expectLastCall().andDelegateTo(new InterfaceServiceDelegate());
-
-        // These will set expectations on routingConfig and interfaceService
-        setUpInterfaceService();
-
-        replay(interfaceService);
-
-        intentSynchronizer = createMock(IntentSynchronizationService.class);
-
-        sdnipFib = new SdnIpFib();
-        sdnipFib.routeService = new TestRouteService();
-        sdnipFib.coreService = new TestCoreService();
-        sdnipFib.interfaceService = interfaceService;
-        sdnipFib.intentSynchronizer = intentSynchronizer;
-
-        sdnipFib.activate();
-    }
-
-    /**
-     * Sets up the interface service.
-     */
-    private void setUpInterfaceService() {
-        List<InterfaceIpAddress> interfaceIpAddresses1 = Lists.newArrayList();
-        interfaceIpAddresses1.add(InterfaceIpAddress.valueOf("192.168.10.101/24"));
-        Interface sw1Eth1 = new Interface("sw1-eth1", SW1_ETH1,
-                                          interfaceIpAddresses1, MacAddress.valueOf("00:00:00:00:00:01"),
-                                          VlanId.vlanId((short) 1));
-        interfaces.add(sw1Eth1);
-
-        List<InterfaceIpAddress> interfaceIpAddresses2 = Lists.newArrayList();
-        interfaceIpAddresses2.add(InterfaceIpAddress.valueOf("192.168.20.101/24"));
-        Interface sw2Eth1 = new Interface("sw2-eth1", SW2_ETH1,
-                                          interfaceIpAddresses2, MacAddress.valueOf("00:00:00:00:00:02"),
-                                          VlanId.vlanId((short) 1));
-        interfaces.add(sw2Eth1);
-
-        InterfaceIpAddress interfaceIpAddress3 = InterfaceIpAddress.valueOf("192.168.30.101/24");
-        Interface sw3Eth1 = new Interface("sw3-eth1", SW3_ETH1,
-                                          Lists.newArrayList(interfaceIpAddress3),
-                                          MacAddress.valueOf("00:00:00:00:00:03"),
-                                          VlanId.vlanId((short) 2));
-        interfaces.add(sw3Eth1);
-
-        expect(interfaceService.getInterfacesByPort(SW1_ETH1)).andReturn(
-                Collections.singleton(sw1Eth1)).anyTimes();
-        expect(interfaceService.getMatchingInterface(Ip4Address.valueOf("192.168.10.1")))
-                .andReturn(sw1Eth1).anyTimes();
-        expect(interfaceService.getInterfacesByPort(SW2_ETH1)).andReturn(
-                Collections.singleton(sw2Eth1)).anyTimes();
-        expect(interfaceService.getMatchingInterface(Ip4Address.valueOf("192.168.20.1")))
-                .andReturn(sw2Eth1).anyTimes();
-        expect(interfaceService.getInterfacesByPort(SW3_ETH1)).andReturn(
-                Collections.singleton(sw3Eth1)).anyTimes();
-        expect(interfaceService.getMatchingInterface(Ip4Address.valueOf("192.168.30.1")))
-                .andReturn(sw3Eth1).anyTimes();
-        expect(interfaceService.getInterfaces()).andReturn(interfaces).anyTimes();
-    }
-
-    /**
-     * Tests adding a route. Ingresses with VLAN and next hop with no VLAN.
-     *
-     * We verify that the synchronizer records the correct state and that the
-     * correct intent is submitted to the IntentService.
-     */
-    @Test
-    public void testRouteAdd() {
-        ResolvedRoute route = new ResolvedRoute(PREFIX1,
-                Ip4Address.valueOf("192.168.30.1"),
-                MacAddress.valueOf("00:00:00:00:00:03"));
-
-        // Construct a MultiPointToSinglePointIntent intent
-        TrafficSelector.Builder selectorBuilder =
-                DefaultTrafficSelector.builder();
-        selectorBuilder.matchEthType(Ethernet.TYPE_IPV4).matchIPDst(PREFIX1)
-                .matchVlanId(VlanId.ANY);
-
-        TrafficTreatment.Builder treatmentBuilder =
-                DefaultTrafficTreatment.builder();
-        treatmentBuilder.setEthDst(MacAddress.valueOf("00:00:00:00:00:03"))
-                .setVlanId(VlanId.vlanId((short) 2));
-
-        Set<ConnectPoint> ingressPoints = new HashSet<>();
-        ingressPoints.add(SW1_ETH1);
-        ingressPoints.add(SW2_ETH1);
-
-        MultiPointToSinglePointIntent intent =
-                MultiPointToSinglePointIntent.builder()
-                        .appId(APPID)
-                        .key(Key.of(PREFIX1.toString(), APPID))
-                        .selector(selectorBuilder.build())
-                        .treatment(treatmentBuilder.build())
-                        .ingressPoints(ingressPoints)
-                        .egressPoint(SW3_ETH1)
-                        .constraints(SdnIpFib.CONSTRAINTS)
-                        .build();
-
-        // Setup the expected intents
-        intentSynchronizer.submit(eqExceptId(intent));
-        replay(intentSynchronizer);
-
-        // Send in the added event
-        routeListener.event(new RouteEvent(RouteEvent.Type.ROUTE_ADDED, route));
-
-        verify(intentSynchronizer);
-    }
-
-    private class TestCoreService extends CoreServiceAdapter {
-        @Override
-        public ApplicationId getAppId(String name) {
-            return APPID;
-        }
-    }
-
-    private class TestRouteService extends RouteServiceAdapter {
-        @Override
-        public void addListener(RouteListener routeListener) {
-            SdnIpFibVlansToVlanDifferentTest.this.routeListener = routeListener;
-        }
-    }
-
-    private class InterfaceServiceDelegate extends InterfaceServiceAdapter {
-        @Override
-        public void addListener(InterfaceListener listener) {
-            SdnIpFibVlansToVlanDifferentTest.this.interfaceListener = listener;
-        }
-    }
-}

-/*
- * Copyright 2016-present Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onosproject.sdnip;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import org.junit.Before;
-import org.junit.Test;
-import org.onlab.packet.Ethernet;
-import org.onlab.packet.Ip4Address;
-import org.onlab.packet.Ip4Prefix;
-import org.onlab.packet.IpPrefix;
-import org.onlab.packet.MacAddress;
-import org.onlab.packet.VlanId;
-import org.onosproject.TestApplicationId;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.core.CoreServiceAdapter;
-import org.onosproject.incubator.net.intf.Interface;
-import org.onosproject.incubator.net.intf.InterfaceListener;
-import org.onosproject.incubator.net.intf.InterfaceService;
-import org.onosproject.incubator.net.intf.InterfaceServiceAdapter;
-import org.onosproject.incubator.net.routing.ResolvedRoute;
-import org.onosproject.incubator.net.routing.RouteEvent;
-import org.onosproject.incubator.net.routing.RouteListener;
-import org.onosproject.incubator.net.routing.RouteServiceAdapter;
-import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.flow.DefaultTrafficSelector;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.TrafficTreatment;
-import org.onosproject.net.host.InterfaceIpAddress;
-import org.onosproject.net.intent.AbstractIntentTest;
-import org.onosproject.net.intent.Key;
-import org.onosproject.net.intent.MultiPointToSinglePointIntent;
-import org.onosproject.routing.IntentSynchronizationService;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.easymock.EasyMock.*;
-import static org.onosproject.routing.TestIntentServiceHelper.eqExceptId;
-
-/**
- * Unit tests for SdnIpFib.
- */
-public class SdnIpFibVlansToVlanSameTest extends AbstractIntentTest {
-
-    private InterfaceService interfaceService;
-
-    private static final ConnectPoint SW1_ETH1 = new ConnectPoint(
-            DeviceId.deviceId("of:0000000000000001"),
-            PortNumber.portNumber(1));
-
-    private static final ConnectPoint SW2_ETH1 = new ConnectPoint(
-            DeviceId.deviceId("of:0000000000000002"),
-            PortNumber.portNumber(1));
-
-    private static final ConnectPoint SW3_ETH1 = new ConnectPoint(
-            DeviceId.deviceId("of:0000000000000003"),
-            PortNumber.portNumber(1));
-
-    private static final IpPrefix PREFIX1 = Ip4Prefix.valueOf("1.1.1.0/24");
-
-    private SdnIpFib sdnipFib;
-    private IntentSynchronizationService intentSynchronizer;
-    private final Set<Interface> interfaces = Sets.newHashSet();
-
-    private static final ApplicationId APPID = TestApplicationId.create("SDNIP");
-
-    private RouteListener routeListener;
-    private InterfaceListener interfaceListener;
-
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-
-        interfaceService = createMock(InterfaceService.class);
-
-        interfaceService.addListener(anyObject(InterfaceListener.class));
-        expectLastCall().andDelegateTo(new InterfaceServiceDelegate());
-
-        // These will set expectations on routingConfig and interfaceService
-        setUpInterfaceService();
-
-        replay(interfaceService);
-
-        intentSynchronizer = createMock(IntentSynchronizationService.class);
-
-        sdnipFib = new SdnIpFib();
-        sdnipFib.routeService = new TestRouteService();
-        sdnipFib.coreService = new TestCoreService();
-        sdnipFib.interfaceService = interfaceService;
-        sdnipFib.intentSynchronizer = intentSynchronizer;
-
-        sdnipFib.activate();
-    }
-
-    /**
-     * Sets up the interface service.
-     */
-    private void setUpInterfaceService() {
-        List<InterfaceIpAddress> interfaceIpAddresses1 = Lists.newArrayList();
-        interfaceIpAddresses1.add(InterfaceIpAddress.valueOf("192.168.10.101/24"));
-        Interface sw1Eth1 = new Interface("sw1-eth1", SW1_ETH1,
-                                          interfaceIpAddresses1, MacAddress.valueOf("00:00:00:00:00:01"),
-                                          VlanId.vlanId((short) 1));
-        interfaces.add(sw1Eth1);
-
-        List<InterfaceIpAddress> interfaceIpAddresses2 = Lists.newArrayList();
-        interfaceIpAddresses2.add(InterfaceIpAddress.valueOf("192.168.20.101/24"));
-        Interface sw2Eth1 = new Interface("sw2-eth1", SW2_ETH1,
-                                          interfaceIpAddresses2, MacAddress.valueOf("00:00:00:00:00:02"),
-                                          VlanId.vlanId((short) 1));
-        interfaces.add(sw2Eth1);
-
-        InterfaceIpAddress interfaceIpAddress3 = InterfaceIpAddress.valueOf("192.168.30.101/24");
-        Interface sw3Eth1 = new Interface("sw3-eth1", SW3_ETH1,
-                                          Lists.newArrayList(interfaceIpAddress3),
-                                          MacAddress.valueOf("00:00:00:00:00:03"),
-                                          VlanId.vlanId((short) 1));
-        interfaces.add(sw3Eth1);
-
-        expect(interfaceService.getInterfacesByPort(SW1_ETH1)).andReturn(
-                Collections.singleton(sw1Eth1)).anyTimes();
-        expect(interfaceService.getMatchingInterface(Ip4Address.valueOf("192.168.10.1")))
-                .andReturn(sw1Eth1).anyTimes();
-        expect(interfaceService.getInterfacesByPort(SW2_ETH1)).andReturn(
-                Collections.singleton(sw2Eth1)).anyTimes();
-        expect(interfaceService.getMatchingInterface(Ip4Address.valueOf("192.168.20.1")))
-                .andReturn(sw2Eth1).anyTimes();
-        expect(interfaceService.getInterfacesByPort(SW3_ETH1)).andReturn(
-                Collections.singleton(sw3Eth1)).anyTimes();
-        expect(interfaceService.getMatchingInterface(Ip4Address.valueOf("192.168.30.1")))
-                .andReturn(sw3Eth1).anyTimes();
-        expect(interfaceService.getInterfaces()).andReturn(interfaces).anyTimes();
-    }
-
-    /**
-     * Tests adding a route. Ingresses with VLAN and next hop with no VLAN.
-     *
-     * We verify that the synchronizer records the correct state and that the
-     * correct intent is submitted to the IntentService.
-     */
-    @Test
-    public void testRouteAdd() {
-        ResolvedRoute route = new ResolvedRoute(PREFIX1,
-                Ip4Address.valueOf("192.168.30.1"),
-                MacAddress.valueOf("00:00:00:00:00:03"));
-
-        // Construct a MultiPointToSinglePointIntent intent
-        TrafficSelector.Builder selectorBuilder =
-                DefaultTrafficSelector.builder();
-        selectorBuilder.matchEthType(Ethernet.TYPE_IPV4).matchIPDst(PREFIX1)
-                .matchVlanId(VlanId.ANY);
-
-        TrafficTreatment.Builder treatmentBuilder =
-                DefaultTrafficTreatment.builder();
-        treatmentBuilder.setEthDst(MacAddress.valueOf("00:00:00:00:00:03"));
-
-        Set<ConnectPoint> ingressPoints = new HashSet<>();
-        ingressPoints.add(SW1_ETH1);
-        ingressPoints.add(SW2_ETH1);
-
-        MultiPointToSinglePointIntent intent =
-                MultiPointToSinglePointIntent.builder()
-                        .appId(APPID)
-                        .key(Key.of(PREFIX1.toString(), APPID))
-                        .selector(selectorBuilder.build())
-                        .treatment(treatmentBuilder.build())
-                        .ingressPoints(ingressPoints)
-                        .egressPoint(SW3_ETH1)
-                        .constraints(SdnIpFib.CONSTRAINTS)
-                        .build();
-
-        // Setup the expected intents
-        intentSynchronizer.submit(eqExceptId(intent));
-        replay(intentSynchronizer);
-
-        // Send in the added event
-        routeListener.event(new RouteEvent(RouteEvent.Type.ROUTE_ADDED, route));
-
-        verify(intentSynchronizer);
-    }
-
-    private class TestCoreService extends CoreServiceAdapter {
-        @Override
-        public ApplicationId getAppId(String name) {
-            return APPID;
-        }
-    }
-
-    private class TestRouteService extends RouteServiceAdapter {
-        @Override
-        public void addListener(RouteListener routeListener) {
-            SdnIpFibVlansToVlanSameTest.this.routeListener = routeListener;
-        }
-    }
-
-    private class InterfaceServiceDelegate extends InterfaceServiceAdapter {
-        @Override
-        public void addListener(InterfaceListener listener) {
-            SdnIpFibVlansToVlanSameTest.this.interfaceListener = listener;
-        }
-    }
-}

-/*
- * Copyright 2016-present Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onosproject.sdnip;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import org.junit.Before;
-import org.junit.Test;
-import org.onlab.packet.Ethernet;
-import org.onlab.packet.Ip4Address;
-import org.onlab.packet.Ip4Prefix;
-import org.onlab.packet.IpPrefix;
-import org.onlab.packet.MacAddress;
-import org.onlab.packet.VlanId;
-import org.onosproject.TestApplicationId;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.core.CoreServiceAdapter;
-import org.onosproject.incubator.net.intf.Interface;
-import org.onosproject.incubator.net.intf.InterfaceListener;
-import org.onosproject.incubator.net.intf.InterfaceService;
-import org.onosproject.incubator.net.intf.InterfaceServiceAdapter;
-import org.onosproject.incubator.net.routing.ResolvedRoute;
-import org.onosproject.incubator.net.routing.RouteEvent;
-import org.onosproject.incubator.net.routing.RouteListener;
-import org.onosproject.incubator.net.routing.RouteServiceAdapter;
-import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.flow.DefaultTrafficSelector;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.TrafficTreatment;
-import org.onosproject.net.host.InterfaceIpAddress;
-import org.onosproject.net.intent.AbstractIntentTest;
-import org.onosproject.net.intent.Key;
-import org.onosproject.net.intent.MultiPointToSinglePointIntent;
-import org.onosproject.routing.IntentSynchronizationService;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.easymock.EasyMock.*;
-import static org.onosproject.routing.TestIntentServiceHelper.eqExceptId;
-
-/**
- * Unit tests for SdnIpFib.
- */
-public class SdnIpFibVlanstoNoVlanTest extends AbstractIntentTest {
-
-    private InterfaceService interfaceService;
-
-    private static final ConnectPoint SW1_ETH1 = new ConnectPoint(
-            DeviceId.deviceId("of:0000000000000001"),
-            PortNumber.portNumber(1));
-
-    private static final ConnectPoint SW2_ETH1 = new ConnectPoint(
-            DeviceId.deviceId("of:0000000000000002"),
-            PortNumber.portNumber(1));
-
-    private static final ConnectPoint SW3_ETH1 = new ConnectPoint(
-            DeviceId.deviceId("of:0000000000000003"),
-            PortNumber.portNumber(1));
-
-    private static final IpPrefix PREFIX1 = Ip4Prefix.valueOf("1.1.1.0/24");
-
-    private SdnIpFib sdnipFib;
-    private IntentSynchronizationService intentSynchronizer;
-    private final Set<Interface> interfaces = Sets.newHashSet();
-
-    private static final ApplicationId APPID = TestApplicationId.create("SDNIP");
-
-    private RouteListener routeListener;
-    private InterfaceListener interfaceListener;
-
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-
-        interfaceService = createMock(InterfaceService.class);
-
-        interfaceService.addListener(anyObject(InterfaceListener.class));
-        expectLastCall().andDelegateTo(new InterfaceServiceDelegate());
-
-        // These will set expectations on routingConfig and interfaceService
-        setUpInterfaceService();
-
-        replay(interfaceService);
-
-        intentSynchronizer = createMock(IntentSynchronizationService.class);
-
-        sdnipFib = new SdnIpFib();
-        sdnipFib.routeService = new TestRouteService();
-        sdnipFib.coreService = new TestCoreService();
-        sdnipFib.interfaceService = interfaceService;
-        sdnipFib.intentSynchronizer = intentSynchronizer;
-
-        sdnipFib.activate();
-    }
-
-    /**
-     * Sets up the interface service.
-     */
-    private void setUpInterfaceService() {
-        List<InterfaceIpAddress> interfaceIpAddresses1 = Lists.newArrayList();
-        interfaceIpAddresses1.add(InterfaceIpAddress.valueOf("192.168.10.101/24"));
-        Interface sw1Eth1 = new Interface("sw1-eth1", SW1_ETH1,
-                                          interfaceIpAddresses1, MacAddress.valueOf("00:00:00:00:00:01"),
-                                          VlanId.vlanId((short) 1));
-        interfaces.add(sw1Eth1);
-
-        List<InterfaceIpAddress> interfaceIpAddresses2 = Lists.newArrayList();
-        interfaceIpAddresses2.add(InterfaceIpAddress.valueOf("192.168.20.101/24"));
-        Interface sw2Eth1 = new Interface("sw2-eth1", SW2_ETH1,
-                                          interfaceIpAddresses2, MacAddress.valueOf("00:00:00:00:00:02"),
-                                          VlanId.vlanId((short) 1));
-        interfaces.add(sw2Eth1);
-
-        InterfaceIpAddress interfaceIpAddress3 = InterfaceIpAddress.valueOf("192.168.30.101/24");
-        Interface sw3Eth1 = new Interface("sw3-eth1", SW3_ETH1,
-                                          Lists.newArrayList(interfaceIpAddress3),
-                                          MacAddress.valueOf("00:00:00:00:00:03"),
-                                          VlanId.NONE);
-        interfaces.add(sw3Eth1);
-
-        expect(interfaceService.getInterfacesByPort(SW1_ETH1)).andReturn(
-                Collections.singleton(sw1Eth1)).anyTimes();
-        expect(interfaceService.getMatchingInterface(Ip4Address.valueOf("192.168.10.1")))
-                .andReturn(sw1Eth1).anyTimes();
-        expect(interfaceService.getInterfacesByPort(SW2_ETH1)).andReturn(
-                Collections.singleton(sw2Eth1)).anyTimes();
-        expect(interfaceService.getMatchingInterface(Ip4Address.valueOf("192.168.20.1")))
-                .andReturn(sw2Eth1).anyTimes();
-        expect(interfaceService.getInterfacesByPort(SW3_ETH1)).andReturn(
-                Collections.singleton(sw3Eth1)).anyTimes();
-        expect(interfaceService.getMatchingInterface(Ip4Address.valueOf("192.168.30.1")))
-                .andReturn(sw3Eth1).anyTimes();
-        expect(interfaceService.getInterfaces()).andReturn(interfaces).anyTimes();
-    }
-
-    /**
-     * Tests adding a route. Ingresses with VLAN and next hop with no VLAN.
-     *
-     * We verify that the synchronizer records the correct state and that the
-     * correct intent is submitted to the IntentService.
-     */
-    @Test
-    public void testRouteAdd() {
-        ResolvedRoute route = new ResolvedRoute(PREFIX1,
-                Ip4Address.valueOf("192.168.30.1"),
-                MacAddress.valueOf("00:00:00:00:00:03"));
-
-        // Construct a MultiPointToSinglePointIntent intent
-        TrafficSelector.Builder selectorBuilder =
-                DefaultTrafficSelector.builder();
-        selectorBuilder.matchEthType(Ethernet.TYPE_IPV4).matchIPDst(PREFIX1)
-                .matchVlanId(VlanId.ANY);
-
-        TrafficTreatment.Builder treatmentBuilder =
-                DefaultTrafficTreatment.builder();
-        treatmentBuilder.setEthDst(MacAddress.valueOf("00:00:00:00:00:03"))
-                .popVlan();
-
-        Set<ConnectPoint> ingressPoints = new HashSet<>();
-        ingressPoints.add(SW1_ETH1);
-        ingressPoints.add(SW2_ETH1);
-
-        MultiPointToSinglePointIntent intent =
-                MultiPointToSinglePointIntent.builder()
-                        .appId(APPID)
-                        .key(Key.of(PREFIX1.toString(), APPID))
-                        .selector(selectorBuilder.build())
-                        .treatment(treatmentBuilder.build())
-                        .ingressPoints(ingressPoints)
-                        .egressPoint(SW3_ETH1)
-                        .constraints(SdnIpFib.CONSTRAINTS)
-                        .build();
-
-        // Setup the expected intents
-        intentSynchronizer.submit(eqExceptId(intent));
-        replay(intentSynchronizer);
-
-        // Send in the added event
-        routeListener.event(new RouteEvent(RouteEvent.Type.ROUTE_ADDED, route));
-
-        verify(intentSynchronizer);
-    }
-
-    private class TestCoreService extends CoreServiceAdapter {
-        @Override
-        public ApplicationId getAppId(String name) {
-            return APPID;
-        }
-    }
-
-    private class TestRouteService extends RouteServiceAdapter {
-        @Override
-        public void addListener(RouteListener routeListener) {
-            SdnIpFibVlanstoNoVlanTest.this.routeListener = routeListener;
-        }
-    }
-
-    private class InterfaceServiceDelegate extends InterfaceServiceAdapter {
-        @Override
-        public void addListener(InterfaceListener listener) {
-            SdnIpFibVlanstoNoVlanTest.this.interfaceListener = listener;
-        }
-    }
-}

@@ -549,7 +549,16 @@ public class NeighbourResolutionManager implements NeighbourResolutionService {
 
 
         @Override
         @Override
         public void forward(NeighbourMessageContext context, Interface outIntf) {
         public void forward(NeighbourMessageContext context, Interface outIntf) {
-            // TODO implement
+            Ethernet packetOut = (Ethernet) context.packet().clone();
+            if (outIntf.vlan().equals(VlanId.NONE)) {
+                // The egress interface has no VLAN Id. Send out an untagged
+                // packet
+                packetOut.setVlanID(Ethernet.VLAN_UNTAGGED);
+            } else {
+                // The egress interface has a VLAN set. Send out a tagged packet
+                packetOut.setVlanID(outIntf.vlan().toShort());
+            }
+            sendTo(packetOut, outIntf.connectPoint());
         }
         }
 
 
         @Override
         @Override