BGPCEP-730: Fix ModifiedNodeDoesNotExistException
[bgpcep.git] / bgp / rib-impl / src / main / java / org / opendaylight / protocol / bgp / rib / impl / config / BgpDeployerImpl.java
index 75560c3ccc44bf5c8b02f52445863f4b504f88ce..2b8bf6594d723f7de64b210c952bb2fc3ed8944e 100644 (file)
@@ -8,25 +8,16 @@
 
 package org.opendaylight.protocol.bgp.rib.impl.config;
 
-import static com.google.common.util.concurrent.Futures.transform;
 import static java.util.Objects.requireNonNull;
-import static org.opendaylight.protocol.bgp.rib.impl.config.OpenConfigMappingUtil.getNeighborInstanceIdentifier;
-import static org.opendaylight.protocol.bgp.rib.impl.config.OpenConfigMappingUtil.getNeighborInstanceName;
-import static org.opendaylight.protocol.bgp.rib.impl.config.OpenConfigMappingUtil.getRibInstanceName;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Dictionary;
 import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import javax.annotation.concurrent.GuardedBy;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
@@ -35,9 +26,8 @@ import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
 import org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryConsumer;
-import org.opendaylight.protocol.bgp.rib.impl.spi.InstanceType;
-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.top.Bgp;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.bgp.Global;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.bgp.Neighbors;
@@ -53,7 +43,6 @@ import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.blueprint.container.BlueprintContainer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -64,51 +53,46 @@ public final class BgpDeployerImpl implements ClusteredDataTreeChangeListener<Bg
     private final BlueprintContainer container;
     private final BundleContext bundleContext;
     private final BGPTableTypeRegistryConsumer tableTypeRegistry;
+    private final ClusterSingletonServiceProvider provider;
+    private ListenerRegistration<BgpDeployerImpl> registration;
     @GuardedBy("this")
-    private final Map<InstanceIdentifier<Bgp>, RibImpl> ribs = new HashMap<>();
-    @GuardedBy("this")
-    private final Map<InstanceIdentifier<Neighbor>, PeerBean> peers = new HashMap<>();
+    private final Map<InstanceIdentifier<Bgp>, BGPClusterSingletonService> bgpCss = new HashMap<>();
     private final DataBroker dataBroker;
-    private ListenerRegistration<BgpDeployerImpl> registration;
+    private final String networkInstanceName;
     @GuardedBy("this")
     private boolean closed;
 
-    public BgpDeployerImpl(final String networkInstanceName, final BlueprintContainer container,
+    public BgpDeployerImpl(final String networkInstanceName, final ClusterSingletonServiceProvider provider,
+            final BlueprintContainer container,
             final BundleContext bundleContext, final DataBroker dataBroker,
             final BGPTableTypeRegistryConsumer mappingService) {
         this.dataBroker = requireNonNull(dataBroker);
+        this.provider = requireNonNull(provider);
+        this.networkInstanceName = requireNonNull(networkInstanceName);
         this.container = requireNonNull(container);
         this.bundleContext = requireNonNull(bundleContext);
         this.tableTypeRegistry = requireNonNull(mappingService);
         this.networkInstanceIId = InstanceIdentifier.create(NetworkInstances.class)
                 .child(NetworkInstance.class, new NetworkInstanceKey(networkInstanceName));
-    }
-
-    private static ListenableFuture<Void> initializeNetworkInstance(
-            final DataBroker dataBroker, final InstanceIdentifier<NetworkInstance> networkInstance) {
-        final WriteTransaction wTx = dataBroker.newWriteOnlyTransaction();
-        wTx.merge(LogicalDatastoreType.CONFIGURATION, networkInstance,
-                new NetworkInstanceBuilder().setName(networkInstance.firstKeyOf(NetworkInstance.class).getName())
-                        .setProtocols(new ProtocolsBuilder().build()).build());
-        return wTx.submit();
-    }
-
-    public synchronized void init() {
         Futures.addCallback(initializeNetworkInstance(dataBroker, this.networkInstanceIId), new FutureCallback<Void>() {
             @Override
             public void onSuccess(final Void result) {
-                LOG.debug("Network Instance {} initialized successfully.", BgpDeployerImpl.this.networkInstanceIId);
+                LOG.debug("Network Instance {} initialized successfully.", networkInstanceName);
             }
 
             @Override
             public void onFailure(final Throwable t) {
-                LOG.error("Failed to initialize Network Instance {}.", BgpDeployerImpl.this.networkInstanceIId, t);
+                LOG.error("Failed to initialize Network Instance {}.", networkInstanceName, t);
             }
         }, MoreExecutors.directExecutor());
-        this.registration = dataBroker.registerDataTreeChangeListener(
-                new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION, this.networkInstanceIId.child(Protocols.class)
-                        .child(Protocol.class).augmentation(Protocol1.class).child(Bgp.class)), this);
-        LOG.info("BGP Deployer {} started.", BgpDeployerImpl.this.networkInstanceIId);
+    }
+
+    public synchronized void init() {
+        this.registration = this.dataBroker.registerDataTreeChangeListener(
+                new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION,
+                        this.networkInstanceIId.child(Protocols.class)
+                                .child(Protocol.class).augmentation(Protocol1.class).child(Bgp.class)), this);
+        LOG.info("BGP Deployer {} started.", this.networkInstanceName);
     }
 
     @Override
@@ -121,7 +105,8 @@ public final class BgpDeployerImpl implements ClusteredDataTreeChangeListener<Bg
             final InstanceIdentifier<Bgp> rootIdentifier = dataTreeModification.getRootPath().getRootIdentifier();
             final DataObjectModification<Bgp> rootNode = dataTreeModification.getRootNode();
             LOG.trace("BGP configuration has changed: {}", rootNode);
-            for (final DataObjectModification<? extends DataObject> dataObjectModification : rootNode.getModifiedChildren()) {
+            for (final DataObjectModification<? extends DataObject> dataObjectModification :
+                    rootNode.getModifiedChildren()) {
                 if (dataObjectModification.getDataType().equals(Global.class)) {
                     onGlobalChanged((DataObjectModification<Global>) dataObjectModification, rootIdentifier);
                 } else if (dataObjectModification.getDataType().equals(Neighbors.class)) {
@@ -131,11 +116,6 @@ public final class BgpDeployerImpl implements ClusteredDataTreeChangeListener<Bg
         }
     }
 
-    @VisibleForTesting
-    public InstanceIdentifier<NetworkInstance> getInstanceIdentifier() {
-        return this.networkInstanceIId;
-    }
-
     @Override
     public synchronized void close() throws Exception {
         LOG.info("Closing BGP Deployer.");
@@ -145,213 +125,49 @@ public final class BgpDeployerImpl implements ClusteredDataTreeChangeListener<Bg
         }
         this.closed = true;
 
-        final List<ListenableFuture<Void>> futurePeerCloseList = this.peers.values().stream()
-                .map(PeerBean::closeServiceInstance).collect(Collectors.toList());
-        final ListenableFuture<List<Void>> futureOfRelevance = Futures.allAsList(futurePeerCloseList);
-
-        final ListenableFuture<ListenableFuture<List<Void>>> maxRelevanceFuture = transform(futureOfRelevance,
-                futurePeersClose -> {
-                    this.peers.values().forEach(PeerBean::close);
-                    BgpDeployerImpl.this.peers.clear();
-
-                    final List<ListenableFuture<Void>> futureRIBCloseList = BgpDeployerImpl.this.ribs.values().stream()
-                            .map(RibImpl::closeServiceInstance).collect(Collectors.toList());
-                    return Futures.allAsList(futureRIBCloseList);
-                }, MoreExecutors.directExecutor());
-
-        final ListenableFuture<Void> ribFutureClose = transform(maxRelevanceFuture, futurePeersClose -> {
-            BgpDeployerImpl.this.ribs.values().forEach(RibImpl::close);
-            this.ribs.clear();
-            return null;
-        }, MoreExecutors.directExecutor());
-
-        ribFutureClose.get();
-    }
-
-    private synchronized void onGlobalChanged(final DataObjectModification<Global> dataObjectModification,
-            final InstanceIdentifier<Bgp> rootIdentifier) {
-        switch (dataObjectModification.getModificationType()) {
-            case DELETE:
-                onGlobalRemoved(rootIdentifier);
-                break;
-            case SUBTREE_MODIFIED:
-            case WRITE:
-                onGlobalModified(rootIdentifier, dataObjectModification.getDataAfter());
-                break;
-            default:
-                break;
-        }
-    }
-
-    @VisibleForTesting
-    synchronized void onGlobalModified(final InstanceIdentifier<Bgp> rootIdentifier, final Global global) {
-        final RibImpl ribImpl = this.ribs.get(rootIdentifier);
-        if (ribImpl == null) {
-            onGlobalCreated(rootIdentifier, global);
-        } else if (!ribImpl.isGlobalEqual(global)) {
-            onGlobalUpdated(rootIdentifier, global, ribImpl);
-        }
-    }
-
-    private synchronized List<PeerBean> closeAllBindedPeers(final InstanceIdentifier<Bgp> rootIdentifier) {
-        final List<PeerBean> filtered = new ArrayList<>();
-        this.peers.entrySet().stream().filter(entry -> entry.getKey().firstIdentifierOf(Bgp.class)
-                .contains(rootIdentifier)).forEach(entry -> {
-            final PeerBean peer = entry.getValue();
+        this.bgpCss.values().iterator().forEachRemaining(service -> {
             try {
-                peer.closeServiceInstance().get();
-            } catch (final Exception e) {
-                LOG.error("Peer instance failed to close service instance", e);
+                service.close();
+            } catch (Exception e) {
+                LOG.warn("Failed to close BGP Cluster Singleton Service.");
             }
-            peer.close();
-            filtered.add(peer);
         });
-        return filtered;
-    }
 
-    private synchronized void onGlobalCreated(final InstanceIdentifier<Bgp> rootIdentifier, final Global global) {
-        LOG.debug("Creating RIB instance with configuration: {}", global);
-        final RibImpl ribImpl = (RibImpl) this.container.getComponentInstance(InstanceType.RIB.getBeanName());
-        initiateRibInstance(rootIdentifier, global, ribImpl);
-        this.ribs.put(rootIdentifier, ribImpl);
-        LOG.debug("RIB instance created: {}", ribImpl);
     }
 
-    private synchronized void onGlobalUpdated(final InstanceIdentifier<Bgp> rootIdentifier, final Global global,
-            final RibImpl ribImpl) {
-        LOG.debug("Modifying RIB instance with configuration: {}", global);
-        final List<PeerBean> closedPeers = closeAllBindedPeers(rootIdentifier);
-        try {
-            ribImpl.closeServiceInstance().get();
-        } catch (final Exception e) {
-            LOG.error("RIB instance failed to close service instance", e);
-        }
-        ribImpl.close();
-        initiateRibInstance(rootIdentifier, global, ribImpl);
-        closedPeers.forEach(peer -> peer.restart(ribImpl, this.tableTypeRegistry));
-        LOG.debug("RIB instance created: {}", ribImpl);
+    private static ListenableFuture<Void> initializeNetworkInstance(
+            final DataBroker dataBroker, final InstanceIdentifier<NetworkInstance> networkInstance) {
+        final WriteTransaction wTx = dataBroker.newWriteOnlyTransaction();
+        wTx.merge(LogicalDatastoreType.CONFIGURATION, networkInstance,
+                new NetworkInstanceBuilder().setName(networkInstance.firstKeyOf(NetworkInstance.class).getName())
+                        .setProtocols(new ProtocolsBuilder().build()).build());
+        return wTx.submit();
     }
 
     @VisibleForTesting
-    synchronized void onGlobalRemoved(final InstanceIdentifier<Bgp> rootIdentifier) {
-        LOG.debug("Removing RIB instance: {}", rootIdentifier);
-        final RibImpl ribImpl = this.ribs.remove(rootIdentifier);
-        if (ribImpl != null) {
-            LOG.debug("RIB instance removed {}", ribImpl);
-            closeAllBindedPeers(rootIdentifier);
-            ribImpl.closeServiceInstance();
-            ribImpl.close();
-        }
-    }
-
-    private synchronized void registerRibInstance(final RibImpl ribImpl, final String ribInstanceName) {
-        final Dictionary<String, String> properties = new Hashtable<>();
-        properties.put(InstanceType.RIB.getBeanName(), ribInstanceName);
-        final ServiceRegistration<?> serviceRegistration = this.bundleContext.registerService(
-                InstanceType.RIB.getServices(), ribImpl, properties);
-        ribImpl.setServiceRegistration(serviceRegistration);
-    }
-
-    private synchronized void initiateRibInstance(final InstanceIdentifier<Bgp> rootIdentifier, final Global global,
-            final RibImpl ribImpl) {
-        final String ribInstanceName = getRibInstanceName(rootIdentifier);
-        ribImpl.start(global, ribInstanceName, this.tableTypeRegistry);
-        registerRibInstance(ribImpl, ribInstanceName);
-    }
-
-    private synchronized void onNeighborsChanged(final DataObjectModification<Neighbors> dataObjectModification,
+    synchronized void onGlobalChanged(final DataObjectModification<Global> dataObjectModification,
             final InstanceIdentifier<Bgp> rootIdentifier) {
-        for (final DataObjectModification<? extends DataObject> neighborModification : dataObjectModification.getModifiedChildren()) {
-            switch (neighborModification.getModificationType()) {
-                case DELETE:
-                    onNeighborRemoved(rootIdentifier, (Neighbor) neighborModification.getDataBefore());
-                    break;
-                case SUBTREE_MODIFIED:
-                case WRITE:
-                    onNeighborModified(rootIdentifier, (Neighbor) neighborModification.getDataAfter());
-                    break;
-                default:
-                    break;
-            }
+        BGPClusterSingletonService old = this.bgpCss.get(rootIdentifier);
+        if (old == null) {
+            old = new BGPClusterSingletonService(this.provider, this.tableTypeRegistry, this.container,
+                    this.bundleContext, rootIdentifier);
+            this.bgpCss.put(rootIdentifier, old);
         }
+        old.onGlobalChanged(dataObjectModification);
     }
 
     @VisibleForTesting
-    synchronized void onNeighborModified(final InstanceIdentifier<Bgp> rootIdentifier, final Neighbor neighbor) {
-        //restart peer instance with a new configuration
-        final PeerBean bgpPeer = this.peers.get(getNeighborInstanceIdentifier(rootIdentifier, neighbor.getKey()));
-        if (bgpPeer == null) {
-            onNeighborCreated(rootIdentifier, neighbor);
-        } else if (!bgpPeer.containsEqualConfiguration(neighbor)) {
-            onNeighborUpdated(bgpPeer, rootIdentifier, neighbor);
-        }
-    }
-
-    private synchronized void onNeighborCreated(final InstanceIdentifier<Bgp> rootIdentifier, final Neighbor neighbor) {
-        LOG.debug("Creating Peer instance with configuration: {}", neighbor);
-        final PeerBean bgpPeer;
-        if (OpenConfigMappingUtil.isApplicationPeer(neighbor)) {
-            bgpPeer = (PeerBean) this.container.getComponentInstance(InstanceType.APP_PEER.getBeanName());
-        } else {
-            bgpPeer = (PeerBean) this.container.getComponentInstance(InstanceType.PEER.getBeanName());
-        }
-        final InstanceIdentifier<Neighbor> neighborInstanceIdentifier =
-                getNeighborInstanceIdentifier(rootIdentifier, neighbor.getKey());
-        initiatePeerInstance(rootIdentifier, neighborInstanceIdentifier, neighbor, bgpPeer);
-        this.peers.put(neighborInstanceIdentifier, bgpPeer);
-        LOG.debug("Peer instance created {}", bgpPeer);
-    }
-
-    private synchronized void onNeighborUpdated(final PeerBean bgpPeer, final InstanceIdentifier<Bgp> rootIdentifier,
-            final Neighbor neighbor) {
-        LOG.debug("Updating Peer instance with configuration: {}", neighbor);
-        bgpPeer.close();
-        final InstanceIdentifier<Neighbor> neighborInstanceIdentifier =
-                getNeighborInstanceIdentifier(rootIdentifier, neighbor.getKey());
-        initiatePeerInstance(rootIdentifier, neighborInstanceIdentifier, neighbor, bgpPeer);
-        LOG.debug("Peer instance updated {}", bgpPeer);
-    }
-
-    @VisibleForTesting
-    synchronized void onNeighborRemoved(final InstanceIdentifier<Bgp> rootIdentifier, final Neighbor neighbor) {
-        LOG.debug("Removing Peer instance: {}", rootIdentifier);
-        final PeerBean bgpPeer = this.peers.remove(getNeighborInstanceIdentifier(rootIdentifier, neighbor.getKey()));
-        if (bgpPeer != null) {
-            bgpPeer.close();
-            LOG.debug("Peer instance removed {}", bgpPeer);
+    synchronized void onNeighborsChanged(final DataObjectModification<Neighbors> dataObjectModification,
+            final InstanceIdentifier<Bgp> rootIdentifier) {
+        BGPClusterSingletonService old = this.bgpCss.get(rootIdentifier);
+        if (old == null) {
+            old = new BGPClusterSingletonService(this.provider, this.tableTypeRegistry, this.container,
+                    this.bundleContext, rootIdentifier);
+            this.bgpCss.put(rootIdentifier, old);
         }
+        old.onNeighborsChanged(dataObjectModification);
     }
 
-    private synchronized void registerPeerInstance(final BgpPeer bgpPeer, final String peerInstanceName) {
-        final Dictionary<String, String> properties = new Hashtable<>();
-        properties.put(InstanceType.PEER.getBeanName(), peerInstanceName);
-        final ServiceRegistration<?> serviceRegistration = this.bundleContext
-                .registerService(InstanceType.PEER.getServices(), bgpPeer, properties);
-        bgpPeer.setServiceRegistration(serviceRegistration);
-    }
-
-    private synchronized void registerAppPeerInstance(final AppPeer appPeer, final String peerInstanceName) {
-        final Dictionary<String, String> properties = new Hashtable<>();
-        properties.put(InstanceType.PEER.getBeanName(), peerInstanceName);
-        final ServiceRegistration<?> serviceRegistration = this.bundleContext
-                .registerService(InstanceType.APP_PEER.getServices(), appPeer, properties);
-        appPeer.setServiceRegistration(serviceRegistration);
-    }
-
-    private synchronized void initiatePeerInstance(final InstanceIdentifier<Bgp> rootIdentifier,
-            final InstanceIdentifier<Neighbor> neighborIdentifier, final Neighbor neighbor,
-            final PeerBean bgpPeer) {
-        final String peerInstanceName = getNeighborInstanceName(neighborIdentifier);
-        final RibImpl rib = this.ribs.get(rootIdentifier);
-        if (rib != null) {
-            bgpPeer.start(rib, neighbor, this.tableTypeRegistry);
-            if (bgpPeer instanceof BgpPeer) {
-                registerPeerInstance((BgpPeer) bgpPeer, peerInstanceName);
-            } else if (bgpPeer instanceof AppPeer) {
-                registerAppPeerInstance((AppPeer) bgpPeer, peerInstanceName);
-            }
-        }
-    }
 
     @VisibleForTesting
     BGPTableTypeRegistryConsumer getTableTypeRegistry() {