Bug 6396: Integrate ne-location-provider with clustering singleton service

Change-Id: I58f44266035a52f17aa8550344b7870d5ce4e01f
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>

diff --git a/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderInstance.java b/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderInstance.java
index f894a91a9ac2c23f626559be1ecd30dde6a42f5e..c932b86544ed1ffdb6c6328fea7b2084d931a3e3 100644 (file)
--- a/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderInstance.java
+++ b/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderInstance.java
@@ -8,19 +8,69 @@
 
 package org.opendaylight.controller.config.yang.config.ne.location.provider.cfg;
 
+import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import org.opendaylight.controller.config.yang.config.groupbasedpolicy.GroupbasedpolicyInstance;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.groupbasedpolicy.ne.location.provider.NeLocationProvider;
+import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
+import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
+import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration;
+import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class NeLocationProviderInstance implements AutoCloseable {
+public class NeLocationProviderInstance implements ClusterSingletonService, AutoCloseable {
 
+    private static final Logger LOG = LoggerFactory.getLogger(NeLocationProviderInstance.class);
+
+    private static final ServiceGroupIdentifier IDENTIFIER =
+            ServiceGroupIdentifier.create(GroupbasedpolicyInstance.GBP_SERVICE_GROUP_IDENTIFIER);
+    private final DataBroker dataBroker;
+    private final ClusterSingletonServiceProvider clusterSingletonService;
+    private ClusterSingletonServiceRegistration singletonServiceRegistration;
     private NeLocationProvider provider;
 
-    public NeLocationProviderInstance (DataBroker dataBroker) {
+    public NeLocationProviderInstance(final DataBroker dataBroker,
+                                      final ClusterSingletonServiceProvider clusterSingletonService) {
+        this.dataBroker = Preconditions.checkNotNull(dataBroker);
+        this.clusterSingletonService = Preconditions.checkNotNull(clusterSingletonService);
+    }
+
+    public void initialize() {
+        LOG.info("Clustering session initiated for {}", this.getClass().getSimpleName());
+        singletonServiceRegistration = clusterSingletonService.registerClusterSingletonService(this);
+    }
+
+    @Override
+    public void instantiateServiceInstance() {
+        LOG.info("Instantiating {}", this.getClass().getSimpleName());
         provider = new NeLocationProvider(dataBroker);
     }
 
     @Override
-    public void close() throws Exception {
+    public ListenableFuture<Void> closeServiceInstance() {
+        LOG.info("Instance {} closed", this.getClass().getSimpleName());
         provider.close();
+        return Futures.immediateFuture(null);
+    }
+
+    @Override
+    public void close() throws Exception {
+        LOG.info("Clustering provider closed for {}", this.getClass().getSimpleName());
+        if (singletonServiceRegistration != null) {
+            try {
+                singletonServiceRegistration.close();
+            } catch (Exception e) {
+                LOG.warn("{} closed unexpectedly", this.getClass().getSimpleName(), e.getMessage());
+            }
+            singletonServiceRegistration = null;
+        }
+    }
+
+    @Override
+    public ServiceGroupIdentifier getIdentifier() {
+        return IDENTIFIER;
     }
 }

diff --git a/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderModule.java b/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderModule.java
index b0c7a9a2b842a71792c45864b010c4564195bb2e..108a3a6d0d79984b365e5f48597bb97ecc8e4b9a 100644 (file)
--- a/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderModule.java
+++ b/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderModule.java
@@ -9,7 +9,7 @@
 package org.opendaylight.controller.config.yang.config.ne.location.provider.cfg;
 
 import org.opendaylight.controller.sal.common.util.NoopAutoCloseable;
-
+@Deprecated
 public class NeLocationProviderModule extends org.opendaylight.controller.config.yang.config.ne.location.provider.cfg.AbstractNeLocationProviderModule {
     public NeLocationProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);

diff --git a/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderModuleFactory.java b/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderModuleFactory.java
index 89479de1d1f54507bd19625083c9e0850a8765d1..9abd3b8b83f717b67796a1d2766d26b6d3e48016 100644 (file)
--- a/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderModuleFactory.java
+++ b/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderModuleFactory.java
@@ -7,6 +7,7 @@
  */
 
 package org.opendaylight.controller.config.yang.config.ne.location.provider.cfg;
+@Deprecated
 public class NeLocationProviderModuleFactory extends org.opendaylight.controller.config.yang.config.ne.location.provider.cfg.AbstractNeLocationProviderModuleFactory {
 
 }

diff --git a/location-providers/ne-location-provider/src/main/resources/org/opendaylight/blueprint/ne-location-provider.xml b/location-providers/ne-location-provider/src/main/resources/org/opendaylight/blueprint/ne-location-provider.xml
index d6598a30cbdb6e9357934fffe64fef071c88dc13..6111d7c1804b5b33a87301abd8ccba54252c8d27 100644 (file)
--- a/location-providers/ne-location-provider/src/main/resources/org/opendaylight/blueprint/ne-location-provider.xml
+++ b/location-providers/ne-location-provider/src/main/resources/org/opendaylight/blueprint/ne-location-provider.xml
@@ -4,9 +4,11 @@
            odl:use-default-for-reference-types="true">
 
     <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"/>
+    <reference id="clusterSingletonService" interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
 
-    <bean id="nelocationProvider" class="org.opendaylight.controller.config.yang.config.ne.location.provider.cfg.NeLocationProviderInstance"
-        destroy-method="close">
+    <bean id="neLocationProvider" class="org.opendaylight.controller.config.yang.config.ne.location.provider.cfg.NeLocationProviderInstance"
+        init-method="initialize" destroy-method="close">
         <argument ref="dataBroker"/>
+        <argument ref="clusterSingletonService"/>
     </bean>
 </blueprint>