Bug 6396: Integrate iovisor renderer with clustering singleton service

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

diff --git a/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderInstance.java b/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderInstance.java
index d6537b299a014f81b5309d928b9c07be40914039..dec8474cb48f6d47b23c797186807a5c74e5f214 100644 (file)
--- a/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderInstance.java
+++ b/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderInstance.java
@@ -8,23 +8,80 @@
 
 package org.opendaylight.controller.config.yang.config.iovisor_provider.impl;
 
+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.api.EpRendererAugmentationRegistry;
 import org.opendaylight.groupbasedpolicy.api.PolicyValidatorRegistry;
 import org.opendaylight.groupbasedpolicy.renderer.iovisor.IovisorRenderer;
+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 IovisorProviderInstance implements AutoCloseable{
+public class IovisorProviderInstance implements ClusterSingletonService, AutoCloseable {
 
+    private static final Logger LOG = LoggerFactory.getLogger(IovisorProviderInstance.class);
+
+    private static final ServiceGroupIdentifier IDENTIFIER =
+            ServiceGroupIdentifier.create(GroupbasedpolicyInstance.GBP_SERVICE_GROUP_IDENTIFIER);
+    private final DataBroker dataBroker;
+    private final EpRendererAugmentationRegistry epRegistry;
+    private final PolicyValidatorRegistry policyValidator;
+    private final ClusterSingletonServiceProvider clusteringServiceProvider;
+    private ClusterSingletonServiceRegistration singletonServiceRegistration;
     private IovisorRenderer renderer;
 
-    public IovisorProviderInstance (DataBroker dataBroker, EpRendererAugmentationRegistry epRegistry,
-            PolicyValidatorRegistry policyValidator) {
+    public IovisorProviderInstance(final DataBroker dataBroker,
+                                   final EpRendererAugmentationRegistry epRegistry,
+                                   final PolicyValidatorRegistry policyValidator,
+                                   final ClusterSingletonServiceProvider clusteringServiceProvider) {
+        this.dataBroker = Preconditions.checkNotNull(dataBroker);
+        this.epRegistry = Preconditions.checkNotNull(epRegistry);
+        this.policyValidator = Preconditions.checkNotNull(policyValidator);
+        this.clusteringServiceProvider = Preconditions.checkNotNull(clusteringServiceProvider);
+    }
+
+    public void initialize() {
+        LOG.info("Clustering session initiated for {}", this.getClass().getSimpleName());
+        singletonServiceRegistration = clusteringServiceProvider.registerClusterSingletonService(this);
+    }
+
+    @Override
+    public void instantiateServiceInstance() {
+        LOG.info("Instantiating {}", this.getClass().getSimpleName());
         renderer = new IovisorRenderer(dataBroker, epRegistry, policyValidator);
     }
 
     @Override
-    public void close() throws Exception {
-        renderer.close();
+    public ListenableFuture<Void> closeServiceInstance() {
+        try {
+            renderer.close();
+        } catch (Exception e) {
+            LOG.warn("Exception while closing ... ", e);
+        }
+        return Futures.immediateFuture(null);
     }
 
+    @Override
+    public void close() {
+        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/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModule.java b/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModule.java
index 29780d5c080ea334639550a008aedbc85e3a2774..179dd9305d3eb5773d415f6d760e71a2624c7ef6 100644 (file)
--- a/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModule.java
+++ b/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModule.java
@@ -9,7 +9,7 @@
 package org.opendaylight.controller.config.yang.config.iovisor_provider.impl;
 
 import org.opendaylight.controller.sal.common.util.NoopAutoCloseable;
-
+@Deprecated
 public class IovisorProviderModule
         extends org.opendaylight.controller.config.yang.config.iovisor_provider.impl.AbstractIovisorProviderModule {
 

diff --git a/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModuleFactory.java b/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModuleFactory.java
index 5588de71f874d0f1c46d607a3aaad9818823a371..6521c9360a599a62e28e13a7f08d120216031772 100644 (file)
--- a/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModuleFactory.java
+++ b/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModuleFactory.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.iovisor_provider.impl;
+@Deprecated
 public class IovisorProviderModuleFactory extends org.opendaylight.controller.config.yang.config.iovisor_provider.impl.AbstractIovisorProviderModuleFactory {
 
 }

diff --git a/renderers/iovisor/src/main/resources/org/opendaylight/blueprint/iovisor-renderer.xml b/renderers/iovisor/src/main/resources/org/opendaylight/blueprint/iovisor-renderer.xml
index cd195adcb57e9d8789f3495dc9926529f5cad51e..336310186e3f35d8fbbcb976d7774b21561bee53 100644 (file)
--- a/renderers/iovisor/src/main/resources/org/opendaylight/blueprint/iovisor-renderer.xml
+++ b/renderers/iovisor/src/main/resources/org/opendaylight/blueprint/iovisor-renderer.xml
@@ -6,11 +6,13 @@
     <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"/>
     <reference id="epRegistry" interface="org.opendaylight.groupbasedpolicy.api.EpRendererAugmentationRegistry"/>
     <reference id="policyValidator" interface="org.opendaylight.groupbasedpolicy.api.PolicyValidatorRegistry"/>
+    <reference id="clusterSingletonService" interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
 
     <bean id="iovisor" class="org.opendaylight.controller.config.yang.config.iovisor_provider.impl.IovisorProviderInstance"
-        destroy-method="close">
+        init-method="initialize" destroy-method="close">
         <argument ref="dataBroker"/>
         <argument ref="epRegistry"/>
         <argument ref="policyValidator"/>
+        <argument ref="clusterSingletonService" />
     </bean>
 </blueprint>
\ No newline at end of file