Bug 6396: Integrate groupbasedpolicy-ise-adapter with clustering singleton service

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

diff --git a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GbpIseAdapterProviderInstance.java b/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GbpIseAdapterProviderInstance.java
index c1af9058eb640e1e5ce440c932028e59ca5c1794..5d49a09fc16324113b67f3e1dd804dca0153dfe1 100644 (file)
--- a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GbpIseAdapterProviderInstance.java
+++ b/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GbpIseAdapterProviderInstance.java
@@ -8,21 +8,73 @@
 
 package org.opendaylight.controller.config.yang.config.groupbasedpolicy.gbp_ise_adapter;
 
+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.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.groupbasedpolicy.gbp_ise_adapter.impl.GbpIseAdapterProvider;
+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 GbpIseAdapterProviderInstance implements AutoCloseable{
+public class GbpIseAdapterProviderInstance implements ClusterSingletonService, AutoCloseable {
 
+    private static final Logger LOG = LoggerFactory.getLogger(GbpIseAdapterProviderInstance.class);
+
+    private static final ServiceGroupIdentifier IDENTIFIER =
+            ServiceGroupIdentifier.create(GroupbasedpolicyInstance.GBP_SERVICE_GROUP_IDENTIFIER);
+    private final DataBroker dataBroker;
+    private final BindingAwareBroker bindingAwareBroker;
+    private final ClusterSingletonServiceProvider clusterSingletonService;
+    private ClusterSingletonServiceRegistration singletonServiceRegistration;
     private GbpIseAdapterProvider iseAdapterProvider;
 
-    public GbpIseAdapterProviderInstance(DataBroker dataBroker, BindingAwareBroker broker) {
-        iseAdapterProvider = new GbpIseAdapterProvider(dataBroker, broker);
+    public GbpIseAdapterProviderInstance(final DataBroker dataBroker,
+                                         final BindingAwareBroker bindingAwareBroker,
+                                         final ClusterSingletonServiceProvider clusterSingletonService) {
+        this.dataBroker = Preconditions.checkNotNull(dataBroker);
+        this.bindingAwareBroker = Preconditions.checkNotNull(bindingAwareBroker);
+        this.clusterSingletonService = Preconditions.checkNotNull(clusterSingletonService);
+    }
+
+    public void initialize() {
+        LOG.info("Clustering session initiated for {}", this.getClass().getSimpleName());
+        singletonServiceRegistration = clusterSingletonService.registerClusterSingletonService(this);
     }
 
     @Override
-    public void close() throws Exception {
+    public void instantiateServiceInstance() {
+        LOG.info("Instantiating {}", this.getClass().getSimpleName());
+        iseAdapterProvider = new GbpIseAdapterProvider(dataBroker, bindingAwareBroker);
+    }
+
+    @Override
+    public ListenableFuture<Void> closeServiceInstance() {
+        LOG.info("Instance {} closed", this.getClass().getSimpleName());
         iseAdapterProvider.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. Cause: {}", e.getMessage());
+            }
+            singletonServiceRegistration = null;
+        }
+    }
+
+    @Override
+    public ServiceGroupIdentifier getIdentifier() {
+        return IDENTIFIER;
+    }
 }

diff --git a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModule.java b/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModule.java
index c5373c98eaab9fe647423b5a9efadcac28bcc07a..9aa51ebfe243fdb318ab76c69c28a77599558424 100644 (file)
--- a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModule.java
+++ b/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModule.java
@@ -13,6 +13,7 @@ import org.opendaylight.controller.sal.common.util.NoopAutoCloseable;
 /**
 * gbp-ise-adapter impl module
 */
+@Deprecated
 public class GpbIseAdapterProviderModule extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.gbp_ise_adapter.AbstractGpbIseAdapterProviderModule {
     public GpbIseAdapterProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);

diff --git a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModuleFactory.java b/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModuleFactory.java
index 4c154475c8cc6e47a7d308db9c55cadf6b89eb2f..5f102ad22acb2f800ae6bfbd15b035a11cfbc6d4 100644 (file)
--- a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModuleFactory.java
+++ b/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/gbp_ise_adapter/GpbIseAdapterProviderModuleFactory.java
@@ -16,6 +16,7 @@
 * Do not modify this file unless it is present under src/main directory
 */
 package org.opendaylight.controller.config.yang.config.groupbasedpolicy.gbp_ise_adapter;
+@Deprecated
 public class GpbIseAdapterProviderModuleFactory extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.gbp_ise_adapter.AbstractGpbIseAdapterProviderModuleFactory {
 
 }

diff --git a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProvider.java b/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProvider.java
index b29509726bcac765c887629e6033c4d43e41ed07..d05afdfad68700d636dae0d90ae128a3d26f3111 100644 (file)
--- a/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProvider.java
+++ b/groupbasedpolicy-ise-adapter/src/main/java/org/opendaylight/groupbasedpolicy/gbp_ise_adapter/impl/GbpIseAdapterProvider.java
@@ -38,7 +38,7 @@ public class GbpIseAdapterProvider implements AutoCloseable, BindingAwareProvide
     }
 
     @Override
-    public void close() throws Exception {
+    public void close() {
         if (registration != null) {
             LOG.info("closing GbpIseAdapterProvider");
             registration.close();

diff --git a/groupbasedpolicy-ise-adapter/src/main/resources/org/opendaylight/blueprint/gbp-ise-adapter.xml b/groupbasedpolicy-ise-adapter/src/main/resources/org/opendaylight/blueprint/gbp-ise-adapter.xml
index acea2234b6616533f7cbfe7f9e751a62a7ba006f..0d982338a3843f587ba99b035127ea413f6f9ee9 100644 (file)
--- a/groupbasedpolicy-ise-adapter/src/main/resources/org/opendaylight/blueprint/gbp-ise-adapter.xml
+++ b/groupbasedpolicy-ise-adapter/src/main/resources/org/opendaylight/blueprint/gbp-ise-adapter.xml
@@ -5,10 +5,12 @@
 
     <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"/>
     <reference id="broker" interface="org.opendaylight.controller.sal.binding.api.BindingAwareBroker"/>
+    <reference id="clusterSingletonService" interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
 
     <bean id="gbpIseAdapter" class="org.opendaylight.controller.config.yang.config.groupbasedpolicy.gbp_ise_adapter.GbpIseAdapterProviderInstance"
-        destroy-method="close">
+        init-method="initialize" destroy-method="close">
         <argument ref="dataBroker"/>
         <argument ref="broker"/>
+        <argument ref="clusterSingletonService"/>
     </bean>
 </blueprint>
\ No newline at end of file