Bulk merge of l2gw changes

[netvirt.git] / elanmanager / impl / src / main / java / org / opendaylight / netvirt / elan / l2gw / ha / listeners / ManagerListener.java

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/ManagerListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/ManagerListener.java
index c2758d057983ea99a6e9c8c0fbf0deb8e14f3bcb..023164accc55d3443d28b6496febbf58ea52ebe5 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/ManagerListener.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/ManagerListener.java
@@ -11,7 +11,7 @@ import java.util.Arrays;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.opendaylight.genius.utils.hwvtep.HwvtepNodeHACache;
+import org.opendaylight.genius.utils.hwvtep.HwvtepHACache;
 import org.opendaylight.genius.utils.hwvtep.HwvtepSouthboundUtils;
 import org.opendaylight.infrautils.utils.concurrent.Executors;
 import org.opendaylight.mdsal.binding.api.DataBroker;
@@ -29,18 +29,15 @@ import org.slf4j.LoggerFactory;
 public final class ManagerListener extends AbstractClusteredAsyncDataTreeChangeListener<Managers> {
 
     private static final Logger LOG = LoggerFactory.getLogger(ManagerListener.class);
-
     private final DataBroker dataBroker;
-    private final HwvtepNodeHACache hwvtepNodeHACache;
 
     @Inject
-    public ManagerListener(DataBroker dataBroker, HwvtepNodeHACache hwvtepNodeHACache) {
+    public ManagerListener(DataBroker dataBroker) {
         super(dataBroker, LogicalDatastoreType.CONFIGURATION,
                 HwvtepSouthboundUtils.createHwvtepTopologyInstanceIdentifier().child(Node.class)
-                        .augmentation(HwvtepGlobalAugmentation.class).child(Managers.class),
+                    .augmentation(HwvtepGlobalAugmentation.class).child(Managers.class),
                 Executors.newListeningSingleThreadExecutor("ManagerListener", LOG));
         this.dataBroker = dataBroker;
-        this.hwvtepNodeHACache = hwvtepNodeHACache;
     }
 
     public void init() {
@@ -66,12 +63,12 @@ public final class ManagerListener extends AbstractClusteredAsyncDataTreeChangeL
     public void add(InstanceIdentifier<Managers> key, Managers managers) {
         InstanceIdentifier<Node> parent = key.firstIdentifierOf(Node.class);
         if (managers.key().getTarget().getValue().contains(HwvtepHAUtil.MANAGER_KEY)
-                && managers.getManagerOtherConfigs() != null) {
+            && managers.getManagerOtherConfigs() != null) {
             managers.nonnullManagerOtherConfigs().values().stream()
                 .filter(otherConfig -> otherConfig.key().getOtherConfigKey().contains(HwvtepHAUtil.HA_CHILDREN))
                 .flatMap(otherConfig -> Arrays.stream(otherConfig.getOtherConfigValue().split(",")))
                 .map(HwvtepHAUtil::convertToInstanceIdentifier)
-                .forEach(childIid -> hwvtepNodeHACache.addChild(parent, childIid));
+                .forEach(childIid -> HwvtepHACache.getInstance().addChild(parent, childIid));
         }
     }
 }