X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=bgp%2Frib-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fprotocol%2Fbgp%2Frib%2Fimpl%2Fconfig%2FAppPeerTest.java;h=cd368716862d51a58c124c0829c91cbca93796a4;hb=912c3fc431015d1b7a1bd3d4808aed13e337531d;hp=91325e1a21c54e2dd148d07556f103e0f35546fc;hpb=3faf4d25e7bd98255499b866e340ae6704ba65ba;p=bgpcep.git

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AppPeerTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AppPeerTest.java
index 91325e1a21..cd36871686 100644
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AppPeerTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AppPeerTest.java
@@ -5,61 +5,78 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.protocol.bgp.rib.impl.config;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.internal.verification.VerificationModeFactory.times;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
+import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener;
+import org.opendaylight.protocol.bgp.rib.impl.state.BGPStateCollector;
+import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group.ConfigBuilder;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbors.Neighbor;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbors.NeighborBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.network.instance.protocol.NeighborPeerGroupConfigBuilder;
 
 public class AppPeerTest extends AbstractConfig {
-    private static final AppPeer APP_PEER = new AppPeer();
+    private final AppPeer appPeer = new AppPeer(new BGPStateCollector());
 
+    private final Neighbor neighbor = new NeighborBuilder()
+            .setConfig(new ConfigBuilder()
+                .addAugmentation(new NeighborPeerGroupConfigBuilder()
+                    .setPeerGroup(OpenConfigMappingUtil.APPLICATION_PEER_GROUP_NAME)
+                    .build())
+                .build())
+            .setNeighborAddress(new IpAddress(new Ipv4Address("127.0.0.1"))).build();
 
+    @Override
     @Before
     public void setUp() throws Exception {
         super.setUp();
-        Mockito.doReturn(true).when(this.mappingService).isApplicationPeer(any(Neighbor.class));
     }
 
     @Test
-    public void testAppPeer() throws Exception {
-        final Neighbor neighbor = new NeighborBuilder().setNeighborAddress(new IpAddress(new Ipv4Address("127.0.0.1"))).build();
-        APP_PEER.start(this.rib, neighbor, this.mappingService, this.configurationWriter);
+    public void testAppPeer() {
+        appPeer.start(this.rib, this.neighbor, null, this.peerGroupLoader, this.tableTypeRegistry);
         Mockito.verify(this.rib).getYangRibId();
         Mockito.verify(this.rib).getService();
-        Mockito.verify(this.rib).getRibIServiceGroupIdentifier();
-        Mockito.verify(this.rib).registerClusterSingletonService(any(ClusterSingletonService.class));
+        Mockito.verify(this.rib).createPeerDOMChain(any(DOMTransactionChainListener.class));
+        Mockito.verify(this.rib, times(1)).getLocalTablesKeys();
 
-        this.singletonService.instantiateServiceInstance();
-        Mockito.verify(this.configurationWriter).apply();
+        appPeer.instantiateServiceInstance();
+        Mockito.verify(this.rib, times(3)).getYangRibId();
         Mockito.verify(this.rib, times(2)).getRibSupportContext();
-        Mockito.verify(this.rib).getLocalTablesKeys();
+        Mockito.verify(this.rib, times(2)).getLocalTablesKeys();
+        Mockito.verify(this.rib, times(2)).createPeerDOMChain(any(DOMTransactionChainListener.class));
         Mockito.verify(this.domTx).newWriteOnlyTransaction();
 
-        APP_PEER.restart(this.rib, this.mappingService);
-        this.singletonService.instantiateServiceInstance();
-        Mockito.verify(this.rib, times(4)).getYangRibId();
-        Mockito.verify(this.rib, times(4)).getService();
-        Mockito.verify(this.rib, times(2)).getRibIServiceGroupIdentifier();
-        Mockito.verify(this.rib, times(2)).registerClusterSingletonService(any(ClusterSingletonService.class));
+        appPeer.closeServiceInstance();
+        Mockito.verify(this.domTx, times(2)).close();
+        appPeer.close();
 
-        this.singletonService.closeServiceInstance();
+        appPeer.restart(this.rib, null, this.peerGroupLoader, this.tableTypeRegistry);
+        appPeer.instantiateServiceInstance();
+        Mockito.verify(this.rib, times(6)).getYangRibId();
+        Mockito.verify(this.rib, times(4)).getService();
+        Mockito.verify(this.rib, times(4)).createPeerDOMChain(any(DOMTransactionChainListener.class));
         Mockito.verify(this.listener, times(2)).close();
 
-        assertTrue(APP_PEER.containsEqualConfiguration(new NeighborBuilder().setNeighborAddress(new IpAddress(new Ipv4Address("127.0.0.1"))).build()));
-        assertFalse(APP_PEER.containsEqualConfiguration(new NeighborBuilder().setNeighborAddress(new IpAddress(new Ipv4Address("127.0.0.2"))).build()));
-        APP_PEER.close();
-        Mockito.verify(this.singletonServiceRegistration).close();
+        assertTrue(appPeer.containsEqualConfiguration(this.neighbor));
+        assertFalse(appPeer.containsEqualConfiguration(new NeighborBuilder()
+                .setNeighborAddress(new IpAddress(new Ipv4Address("127.0.0.2"))).build()));
+        appPeer.closeServiceInstance();
+        Mockito.verify(this.domTx, times(4)).close();
+
+        appPeer.instantiateServiceInstance();
+        Mockito.verify(this.rib, times(6)).createPeerDOMChain(any(DOMTransactionChainListener.class));
+        appPeer.closeServiceInstance();
+        Mockito.verify(this.domTx, times(6)).close();
+        appPeer.close();
     }
-}
\ No newline at end of file
+}