[Goldeneye] [ONOS-4161] BGP L3 Topology

Change-Id: I81ae4e88f6ab75202b98ed03cbe1597d0f6ddd1e
diff --git a/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java b/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java
index 7a810ee..21e2a98 100755
--- a/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java
+++ b/providers/bgp/topology/src/test/java/org/onosproject/provider/bgp/topology/impl/BgpTopologyProviderTest.java
@@ -12,11 +12,13 @@
  */
 package org.onosproject.provider.bgp.topology.impl;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNot.not;
+import static org.onosproject.net.Link.State.ACTIVE;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -27,59 +29,80 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.onosproject.bgp.controller.BgpCfg;
-import org.onosproject.bgp.controller.BgpController;
-import org.onosproject.bgp.controller.BgpId;
-import org.onosproject.bgp.controller.BgpPeer;
-import org.onosproject.bgp.controller.BgpLocalRib;
+import org.onlab.packet.ChassisId;
+import org.onosproject.bgp.controller.BgpLinkListener;
 import org.onosproject.bgp.controller.BgpNodeListener;
-import org.onosproject.bgp.controller.BgpPeerManager;
 import org.onosproject.bgpio.exceptions.BgpParseException;
-import org.onosproject.bgpio.protocol.BgpMessage;
+import org.onosproject.bgpio.protocol.linkstate.BgpLinkLSIdentifier;
+import org.onosproject.bgpio.protocol.linkstate.BgpLinkLsNlriVer4;
 import org.onosproject.bgpio.protocol.linkstate.BgpNodeLSIdentifier;
 import org.onosproject.bgpio.protocol.linkstate.BgpNodeLSNlriVer4;
+import org.onosproject.bgpio.protocol.linkstate.BgpNodeLSNlriVer4.ProtocolType;
 import org.onosproject.bgpio.protocol.linkstate.NodeDescriptors;
+import org.onosproject.bgpio.protocol.linkstate.PathAttrNlriDetails;
 import org.onosproject.bgpio.types.AutonomousSystemTlv;
 import org.onosproject.bgpio.types.BgpValueType;
+import org.onosproject.bgpio.types.IsIsNonPseudonode;
+import org.onosproject.bgpio.types.LinkLocalRemoteIdentifiersTlv;
 import org.onosproject.bgpio.types.RouteDistinguisher;
 import org.onosproject.bgpio.util.Constants;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DefaultDevice;
+import org.onosproject.net.DefaultLink;
+import org.onosproject.net.Device;
 import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
 import org.onosproject.net.MastershipRole;
 import org.onosproject.net.device.DeviceDescription;
 import org.onosproject.net.device.DeviceProvider;
 import org.onosproject.net.device.DeviceProviderRegistry;
 import org.onosproject.net.device.DeviceProviderService;
+import org.onosproject.net.device.DeviceServiceAdapter;
 import org.onosproject.net.device.PortDescription;
 import org.onosproject.net.device.PortStatistics;
+import org.onosproject.net.link.LinkDescription;
+import org.onosproject.net.link.LinkProvider;
+import org.onosproject.net.link.LinkProviderRegistry;
+import org.onosproject.net.link.LinkProviderService;
 import org.onosproject.net.provider.ProviderId;
 
+/**
+ * Test for BGP topology provider.
+ */
 public class BgpTopologyProviderTest {
+    private static final DeviceId DID2 = DeviceId.deviceId("bgp:rd=0::routinguniverse=0:asn=10");
+    private static final String UNKNOWN = new String("unknown");
+    public static ProviderId providerId = new ProviderId("bgp", "foo");
 
-    private static final DeviceId DID1 = DeviceId
-            .deviceId("bgp:rd=0:proto=direct:id=0:as=100");
-    private static final DeviceId DID2 = DeviceId
-            .deviceId("bgp:rd=0:proto=direct:id=0:as=10");
-    private static final DeviceId DID3 = DeviceId
-            .deviceId("bgp:rd=0:proto=direct:id=0:as=100");
     private final BgpTopologyProvider provider = new BgpTopologyProvider();
     private final TestDeviceRegistry nodeRegistry = new TestDeviceRegistry();
-    private final TestController controller = new TestController();
+    private final TestLinkRegistry linkRegistry = new TestLinkRegistry();
+    private final MockBgpController controller = new MockBgpController();
+    private MockDeviceService deviceService = new MockDeviceService();
+    private Map<DeviceId, Device> deviceMap = new HashMap<>();
+
 
     @Before
     public void startUp() {
         provider.deviceProviderRegistry = nodeRegistry;
+        provider.linkProviderRegistry = linkRegistry;
         provider.controller = controller;
+        provider.deviceService = deviceService;
         provider.activate();
-        assertNotNull("provider should be registered", nodeRegistry.provider);
-        assertNotNull("listener should be registered", controller.nodeListener);
+        assertThat("device provider should be registered", not(nodeRegistry.provider));
+        assertThat("link provider should be registered", not(linkRegistry.linkProvider));
+        assertThat("node listener should be registered", not(controller.nodeListener));
+        assertThat("link listener should be registered", not(controller.linkListener));
     }
 
     @After
     public void tearDown() {
         provider.deactivate();
-        assertNull("listener should be removed", controller.nodeListener);
         provider.controller = null;
+        provider.deviceService = null;
         provider.deviceProviderRegistry = null;
+        assertThat(controller.nodeListener, is(new HashSet<BgpNodeListener>()));
+        assertThat(controller.linkListener, is(new HashSet<BgpLinkListener>()));
     }
 
     /* Class implement device test registry */
@@ -112,15 +135,19 @@
 
             @Override
             public void deviceConnected(DeviceId deviceId, DeviceDescription deviceDescription) {
-                if (deviceId.equals(DID1)) {
+                if (!deviceId.equals(DID2)) {
                     connected.add(deviceId);
+                    Device device = new DefaultDevice(BgpTopologyProviderTest.providerId, deviceId, Device.Type.ROUTER,
+                            UNKNOWN, UNKNOWN, UNKNOWN, UNKNOWN, new ChassisId());
+                    deviceMap.put(deviceId, device);
                 }
             }
 
             @Override
             public void deviceDisconnected(DeviceId deviceId) {
-                if (deviceId.equals(DID1)) {
+                if (!deviceId.equals(DID2)) {
                     connected.remove(deviceId);
+                    deviceMap.remove(deviceId);
                 }
             }
 
@@ -150,9 +177,65 @@
         }
     }
 
-    /* class implement test controller */
-    private class TestController implements BgpController {
+    /* Class implement device test registry */
+    private class TestLinkRegistry implements LinkProviderRegistry {
+        LinkProvider linkProvider;
+        Set<Link> links = new HashSet<>();
+
+        @Override
+        public LinkProviderService register(LinkProvider provider) {
+            this.linkProvider = provider;
+            return new TestProviderService();
+        }
+
+        @Override
+        public void unregister(LinkProvider provider) {
+            // TODO Auto-generated method stub
+        }
+
+        @Override
+        public Set<ProviderId> getProviders() {
+            return null;
+        }
+
+        private class TestProviderService implements LinkProviderService {
+
+            @Override
+            public void linkDetected(LinkDescription linkDescription) {
+                links.add(DefaultLink.builder().src(linkDescription.src())
+                        .dst(linkDescription.dst()).state(ACTIVE).type(linkDescription.type())
+                        .providerId(BgpTopologyProviderTest.providerId).build());
+            }
+
+            @Override
+            public void linkVanished(LinkDescription linkDescription) {
+                links.remove(DefaultLink.builder().src(linkDescription.src())
+                        .dst(linkDescription.dst()).state(ACTIVE).type(linkDescription.type())
+                        .providerId(BgpTopologyProviderTest.providerId).build());
+            }
+
+            @Override
+            public void linksVanished(ConnectPoint connectPoint) {
+                // TODO Auto-generated method stub
+            }
+
+            @Override
+            public void linksVanished(DeviceId deviceId) {
+                // TODO Auto-generated method stub
+            }
+
+            @Override
+            public LinkProvider provider() {
+                // TODO Auto-generated method stub
+                return null;
+            }
+        }
+    }
+
+    /* Test class for BGP controller */
+    private class MockBgpController extends BgpControllerAdapter {
         protected Set<BgpNodeListener> nodeListener = new CopyOnWriteArraySet<>();
+        protected Set<BgpLinkListener> linkListener = new CopyOnWriteArraySet<>();
 
         @Override
         public void addListener(BgpNodeListener nodeListener) {
@@ -161,88 +244,34 @@
 
         @Override
         public void removeListener(BgpNodeListener nodeListener) {
-            this.nodeListener = null;
+            this.nodeListener.remove(nodeListener);
         }
 
         @Override
-        public Iterable<BgpPeer> getPeers() {
-            // TODO Auto-generated method stub
-            return null;
+        public void addLinkListener(BgpLinkListener linkListener) {
+            this.linkListener.add(linkListener);
         }
 
         @Override
-        public BgpPeer getPeer(BgpId bgpId) {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public void writeMsg(BgpId bgpId, BgpMessage msg) {
-            // TODO Auto-generated method stub
-
-        }
-
-        @Override
-        public void processBgpPacket(BgpId bgpId, BgpMessage msg) throws BgpParseException {
-            // TODO Auto-generated method stub
-
-        }
-
-        @Override
-        public void closeConnectedPeers() {
-            // TODO Auto-generated method stub
-
-        }
-
-        @Override
-        public BgpCfg getConfig() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public int connectedPeerCount() {
-            // TODO Auto-generated method stub
-            return 0;
-        }
-
-        @Override
-        public BgpLocalRib bgpLocalRibVpn() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public BgpLocalRib bgpLocalRib() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public BgpPeerManager peerManager() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public Map<BgpId, BgpPeer> connectedPeers() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public Set<BgpNodeListener> listener() {
-            // TODO Auto-generated method stub
-            return null;
+        public void removeLinkListener(BgpLinkListener linkListener) {
+            this.linkListener.remove(linkListener);
         }
     }
 
-    /* Validate node is added to the device validating URI, RIB should get updated properly */
+    /* Mock test for device service */
+    private class MockDeviceService extends DeviceServiceAdapter {
+        @Override
+        public Device getDevice(DeviceId deviceId) {
+            return deviceMap.get(deviceId);
+        }
+    }
+
+    /**
+     * Validate node is added to the device validating URI, RIB should get updated properly.
+     */
     @Test
     public void bgpTopologyProviderTestAddDevice1() {
-        int deviceAddCount = 0;
-        LinkedList<BgpValueType> subTlvs;
-        subTlvs = new LinkedList<>();
+        LinkedList<BgpValueType> subTlvs = new LinkedList<>();
         BgpValueType tlv = new AutonomousSystemTlv(100);
         short deslength = AutonomousSystemTlv.LENGTH;
         short desType = AutonomousSystemTlv.TYPE;
@@ -253,18 +282,23 @@
         BgpNodeLSNlriVer4 nodeNlri = new BgpNodeLSNlriVer4(0, (byte) Constants.DIRECT, localNodeDescriptors, false,
                                                            new RouteDistinguisher());
 
-        nodeNlri.setNodeLSIdentifier(localNodeDescriptors);
+        PathAttrNlriDetails details = new PathAttrNlriDetails();
+        details.setIdentifier(0);
+        details.setProtocolID(ProtocolType.DIRECT);
+        List<BgpValueType> pathAttributes = new LinkedList<>();
+        details.setPathAttribute(pathAttributes);
+
         for (BgpNodeListener l : controller.nodeListener) {
-            l.addNode(nodeNlri);
-            deviceAddCount = nodeRegistry.connected.size();
-            assertTrue(deviceAddCount == 1);
+            l.addNode(nodeNlri, details);
+            assertThat(nodeRegistry.connected.size(), is(1));
             l.deleteNode(nodeNlri);
-            deviceAddCount = nodeRegistry.connected.size();
-            assertTrue(deviceAddCount == 0);
+            assertThat(nodeRegistry.connected.size(), is(0));
         }
     }
 
-    /* Validate node is not added to the device for invalid URI, RIB count should be zero */
+    /**
+     * Validate node is not added to the device for invalid URI, RIB count should be zero.
+     */
     @Test
     public void bgpTopologyProviderTestAddDevice2() {
         LinkedList<BgpValueType> subTlvs;
@@ -272,6 +306,12 @@
         short deslength = AutonomousSystemTlv.LENGTH;
         short desType = AutonomousSystemTlv.TYPE;
 
+        PathAttrNlriDetails details = new PathAttrNlriDetails();
+        details.setIdentifier(0);
+        details.setProtocolID(ProtocolType.DIRECT);
+        List<BgpValueType> pathAttributes = new LinkedList<>();
+        details.setPathAttribute(pathAttributes);
+
         subTlvs = new LinkedList<>();
         subTlvs.add(tlv);
         BgpNodeLSIdentifier localNodeDescriptors = new BgpNodeLSIdentifier(new NodeDescriptors(subTlvs, deslength,
@@ -279,14 +319,16 @@
         BgpNodeLSNlriVer4 nodeNlri = new BgpNodeLSNlriVer4(0, (byte) Constants.DIRECT, localNodeDescriptors, false,
                                                            new RouteDistinguisher());
 
-        nodeNlri.setNodeLSIdentifier(localNodeDescriptors);
+
         for (BgpNodeListener l : controller.nodeListener) {
-            l.addNode(nodeNlri);
-            assertTrue("Failed to add device", (nodeRegistry.connected.size() == 0));
+            l.addNode(nodeNlri, details);
+            assertThat(nodeRegistry.connected.size(), is(0));
         }
     }
 
-    /* Delete node when node does not exist, RIB count should be zero */
+    /**
+     * Delete node when node does not exist, RIB count should be zero.
+     */
     @Test
     public void bgpTopologyProviderTestAddDevice3() {
         LinkedList<BgpValueType> subTlvs;
@@ -301,10 +343,173 @@
         BgpNodeLSNlriVer4 nodeNlri = new BgpNodeLSNlriVer4(0, (byte) Constants.DIRECT, localNodeDescriptors, false,
                                                            new RouteDistinguisher());
 
-        nodeNlri.setNodeLSIdentifier(localNodeDescriptors);
         for (BgpNodeListener l : controller.nodeListener) {
             l.deleteNode(nodeNlri);
-            assertTrue("Failed to add device", (nodeRegistry.connected.size() == 0));
+            assertThat(nodeRegistry.connected.size(), is(0));
+        }
+    }
+
+    /**
+     * Add a link and two devices.
+     *
+     * @throws BgpParseException while adding a link.
+     */
+    @Test
+    public void bgpTopologyProviderTestAddLink1() throws BgpParseException {
+        LinkedList<BgpValueType> localTlvs = new LinkedList<>();
+        LinkedList<BgpValueType> remoteTlvs = new LinkedList<>();
+        LinkedList<BgpValueType> linkdes = new LinkedList<>();
+        BgpValueType tlv = new AutonomousSystemTlv(10);
+        short deslength = AutonomousSystemTlv.LENGTH;
+        short desType = AutonomousSystemTlv.TYPE;
+
+        localTlvs.add(tlv);
+        remoteTlvs.add(tlv);
+        tlv = IsIsNonPseudonode.of(new byte[] {20, 20, 20, 20, 00, 20});
+        localTlvs.add(tlv);
+        tlv = IsIsNonPseudonode.of(new byte[] {30, 30, 30, 30, 00, 30});
+        remoteTlvs.add(tlv);
+        NodeDescriptors localNode = new NodeDescriptors(localTlvs, deslength, desType);
+        NodeDescriptors remoteNode = new NodeDescriptors(remoteTlvs, deslength, desType);
+        BgpNodeLSIdentifier localNodeDescriptors = new BgpNodeLSIdentifier(localNode);
+        BgpNodeLSNlriVer4 nodeNlri = new BgpNodeLSNlriVer4(0, (byte) Constants.DIRECT, localNodeDescriptors, false,
+                                                           new RouteDistinguisher());
+
+        BgpNodeLSIdentifier remoteNodeDescriptors = new BgpNodeLSIdentifier(remoteNode);
+        BgpNodeLSNlriVer4 remNodeNlri = new BgpNodeLSNlriVer4(0, (byte) Constants.DIRECT, remoteNodeDescriptors, false,
+                                                           new RouteDistinguisher());
+
+        PathAttrNlriDetails details = new PathAttrNlriDetails();
+        details.setIdentifier(0);
+        details.setProtocolID(ProtocolType.DIRECT);
+        List<BgpValueType> pathAttributes = new LinkedList<>();
+        details.setPathAttribute(pathAttributes);
+
+        tlv = LinkLocalRemoteIdentifiersTlv.of(99, 100);
+        linkdes.add(tlv);
+        BgpLinkLSIdentifier linkId = new BgpLinkLSIdentifier(localNode, remoteNode, linkdes);
+        BgpLinkLsNlriVer4 linkNlri = new BgpLinkLsNlriVer4((byte) Constants.DIRECT, 0, linkId,
+                new RouteDistinguisher(), false);
+        for (BgpNodeListener l : controller.nodeListener) {
+            l.addNode(nodeNlri, details);
+            assertThat(nodeRegistry.connected.size(), is(1));
+            l.addNode(remNodeNlri, details);
+            assertThat(nodeRegistry.connected.size(), is(2));
+        }
+        for (BgpLinkListener l : controller.linkListener) {
+            l.addLink(linkNlri, details);
+            assertThat(linkRegistry.links.size(), is(1));
+        }
+    }
+
+    /**
+     * Add a link and delete a link.
+     *
+     * @throws BgpParseException while adding or removing the link
+     */
+    @Test
+    public void bgpTopologyProviderTestAddLink2() throws BgpParseException {
+        LinkedList<BgpValueType> localTlvs = new LinkedList<>();
+        LinkedList<BgpValueType> remoteTlvs = new LinkedList<>();
+        LinkedList<BgpValueType> linkdes = new LinkedList<>();
+        BgpValueType tlv = new AutonomousSystemTlv(10);
+        short deslength = AutonomousSystemTlv.LENGTH;
+        short desType = AutonomousSystemTlv.TYPE;
+
+        localTlvs.add(tlv);
+        remoteTlvs.add(tlv);
+        tlv = IsIsNonPseudonode.of(new byte[] {20, 20, 20, 20, 00, 20});
+        localTlvs.add(tlv);
+        tlv = IsIsNonPseudonode.of(new byte[] {30, 30, 30, 30, 00, 30});
+        remoteTlvs.add(tlv);
+        NodeDescriptors localNode = new NodeDescriptors(localTlvs, deslength, desType);
+        NodeDescriptors remoteNode = new NodeDescriptors(remoteTlvs, deslength, desType);
+        BgpNodeLSIdentifier localNodeDescriptors = new BgpNodeLSIdentifier(localNode);
+        BgpNodeLSNlriVer4 nodeNlri = new BgpNodeLSNlriVer4(0, (byte) Constants.DIRECT, localNodeDescriptors, false,
+                                                           new RouteDistinguisher());
+
+        BgpNodeLSIdentifier remoteNodeDescriptors = new BgpNodeLSIdentifier(remoteNode);
+        BgpNodeLSNlriVer4 remNodeNlri = new BgpNodeLSNlriVer4(0, (byte) Constants.DIRECT, remoteNodeDescriptors, false,
+                                                           new RouteDistinguisher());
+
+        PathAttrNlriDetails details = new PathAttrNlriDetails();
+        details.setIdentifier(0);
+        details.setProtocolID(ProtocolType.DIRECT);
+        List<BgpValueType> pathAttributes = new LinkedList<>();
+        details.setPathAttribute(pathAttributes);
+
+        tlv = LinkLocalRemoteIdentifiersTlv.of(99, 100);
+        linkdes.add(tlv);
+        BgpLinkLSIdentifier linkId = new BgpLinkLSIdentifier(localNode, remoteNode, linkdes);
+        BgpLinkLsNlriVer4 linkNlri = new BgpLinkLsNlriVer4((byte) Constants.DIRECT, 0, linkId,
+                new RouteDistinguisher(), false);
+        for (BgpNodeListener l : controller.nodeListener) {
+            l.addNode(nodeNlri, details);
+            assertThat(nodeRegistry.connected.size(), is(1));
+            l.addNode(remNodeNlri, details);
+            assertThat(nodeRegistry.connected.size(), is(2));
+            l.deleteNode(nodeNlri);
+            assertThat(nodeRegistry.connected.size(), is(1));
+        }
+        for (BgpLinkListener l : controller.linkListener) {
+            l.addLink(linkNlri, details);
+            assertThat(linkRegistry.links.size(), is(1));
+            l.deleteLink(linkNlri);
+            assertThat(linkRegistry.links.size(), is(0));
+        }
+    }
+
+    /**
+     * Invalid link.
+     *
+     * @throws BgpParseException while adding or deleting a link
+     */
+    @Test
+    public void bgpTopologyProviderTestDeleteLink3() throws BgpParseException {
+        LinkedList<BgpValueType> localTlvs = new LinkedList<>();
+        LinkedList<BgpValueType> remoteTlvs = new LinkedList<>();
+        LinkedList<BgpValueType> linkdes = new LinkedList<>();
+        BgpValueType tlv = new AutonomousSystemTlv(10);
+        short deslength = AutonomousSystemTlv.LENGTH;
+        short desType = AutonomousSystemTlv.TYPE;
+
+        localTlvs.add(tlv);
+        remoteTlvs.add(tlv);
+        tlv = IsIsNonPseudonode.of(new byte[] {20, 20, 20, 20, 00, 20});
+        localTlvs.add(tlv);
+        tlv = IsIsNonPseudonode.of(new byte[] {30, 30, 30, 30, 00, 30});
+        remoteTlvs.add(tlv);
+        NodeDescriptors localNode = new NodeDescriptors(localTlvs, deslength, desType);
+        NodeDescriptors remoteNode = new NodeDescriptors(remoteTlvs, deslength, desType);
+        BgpNodeLSIdentifier localNodeDescriptors = new BgpNodeLSIdentifier(localNode);
+        BgpNodeLSNlriVer4 nodeNlri = new BgpNodeLSNlriVer4(0, (byte) Constants.DIRECT, localNodeDescriptors, false,
+                                                           new RouteDistinguisher());
+
+        BgpNodeLSIdentifier remoteNodeDescriptors = new BgpNodeLSIdentifier(remoteNode);
+        BgpNodeLSNlriVer4 remNodeNlri = new BgpNodeLSNlriVer4(0, (byte) Constants.DIRECT, remoteNodeDescriptors, false,
+                                                           new RouteDistinguisher());
+
+        PathAttrNlriDetails details = new PathAttrNlriDetails();
+        details.setIdentifier(0);
+        details.setProtocolID(ProtocolType.DIRECT);
+        List<BgpValueType> pathAttributes = new LinkedList<>();
+        details.setPathAttribute(pathAttributes);
+
+        tlv = LinkLocalRemoteIdentifiersTlv.of(99, 100);
+        linkdes.add(tlv);
+        BgpLinkLSIdentifier linkId = new BgpLinkLSIdentifier(localNode, remoteNode, linkdes);
+        BgpLinkLsNlriVer4 linkNlri = new BgpLinkLsNlriVer4((byte) Constants.DIRECT, 0, linkId,
+                new RouteDistinguisher(), false);
+        for (BgpNodeListener l : controller.nodeListener) {
+            l.addNode(nodeNlri, details);
+            l.addNode(remNodeNlri, details);
+            assertThat(nodeRegistry.connected.size(), is(2));
+            l.deleteNode(nodeNlri);
+            assertThat(nodeRegistry.connected.size(), is(1));
+        }
+        for (BgpLinkListener l : controller.linkListener) {
+            l.deleteLink(linkNlri);
+            assertThat(linkRegistry.links.size(), is(0));
         }
     }
 }