Bug 6396: Integrate openflow-overlay with clustering singleton service

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

diff --git a/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderInstance.java b/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderInstance.java
index b19dafab9d3332d8a8fc7cc338de04baffbfee43..c8ff5486ef4ccdd3727234a67c478972690458ca 100644 (file)
--- a/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderInstance.java
+++ b/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderInstance.java
@@ -8,42 +8,101 @@
 
 package org.opendaylight.controller.config.yang.config.ofoverlay_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.controller.md.sal.binding.api.NotificationService;
 import org.opendaylight.groupbasedpolicy.api.EpRendererAugmentationRegistry;
 import org.opendaylight.groupbasedpolicy.api.PolicyValidatorRegistry;
 import org.opendaylight.groupbasedpolicy.api.StatisticsManager;
 import org.opendaylight.groupbasedpolicy.renderer.ofoverlay.OFOverlayRenderer;
+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.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class OFOverlayProviderInstance implements AutoCloseable {
-
-
-    public OFOverlayRenderer renderer;
-
-    public OFOverlayProviderInstance(DataBroker dataBroker,
-            PacketProcessingService packetProcessingService,
-            SalFlowService flowService,
-            NotificationService notificationService,
-            EpRendererAugmentationRegistry epRendererAugmentationRegistry,
-            PolicyValidatorRegistry policyValidatorRegistry,
-            StatisticsManager statisticsManager,
-            short tableOffset
-            ) {
-        renderer = new OFOverlayRenderer(dataBroker,
-                packetProcessingService,
-                flowService,
-                notificationService,
-                epRendererAugmentationRegistry,
-                policyValidatorRegistry,
-                statisticsManager,
-                tableOffset);
+public class OFOverlayProviderInstance implements ClusterSingletonService, AutoCloseable {
+
+    private static final Logger LOG = LoggerFactory.getLogger(OFOverlayProviderInstance.class);
+
+    private static final ServiceGroupIdentifier IDENTIFIER =
+            ServiceGroupIdentifier.create(GroupbasedpolicyInstance.GBP_SERVICE_GROUP_IDENTIFIER);
+    private final DataBroker dataBroker;
+    private final PacketProcessingService packetProcessingService;
+    private final SalFlowService flowService;
+    private final NotificationService notificationService;
+    private final EpRendererAugmentationRegistry epRendererAugmentationRegistry;
+    private final PolicyValidatorRegistry policyValidatorRegistry;
+    private final StatisticsManager statisticsManager;
+    private final short tableOffset;
+    private final ClusterSingletonServiceProvider clusterSingletonService;
+    private ClusterSingletonServiceRegistration singletonServiceRegistration;
+    private OFOverlayRenderer renderer;
+
+    public OFOverlayProviderInstance(final DataBroker dataBroker,
+                                     final PacketProcessingService packetProcessingService,
+                                     final SalFlowService flowService,
+                                     final NotificationService notificationService,
+                                     final EpRendererAugmentationRegistry epRendererAugmentationRegistry,
+                                     final PolicyValidatorRegistry policyValidatorRegistry,
+                                     final StatisticsManager statisticsManager,
+                                     final short tableOffset,
+                                     final ClusterSingletonServiceProvider clusterSingletonService) {
+        this.dataBroker = Preconditions.checkNotNull(dataBroker);
+        this.packetProcessingService = Preconditions.checkNotNull(packetProcessingService);
+        this.flowService = Preconditions.checkNotNull(flowService);
+        this.notificationService = Preconditions.checkNotNull(notificationService);
+        this.epRendererAugmentationRegistry = Preconditions.checkNotNull(epRendererAugmentationRegistry);
+        this.policyValidatorRegistry = Preconditions.checkNotNull(policyValidatorRegistry);
+        this.statisticsManager = Preconditions.checkNotNull(statisticsManager);
+        this.tableOffset = Preconditions.checkNotNull(tableOffset);
+        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 {
-        renderer.close();
+    public void instantiateServiceInstance() {
+        LOG.info("Instantiating {}", this.getClass().getSimpleName());
+        renderer = new OFOverlayRenderer(dataBroker, packetProcessingService, flowService, notificationService,
+                epRendererAugmentationRegistry, policyValidatorRegistry, statisticsManager, tableOffset);
     }
 
+    @Override
+    public ListenableFuture<Void> closeServiceInstance() {
+        LOG.info("Instance {} closed", this.getClass().getSimpleName());
+        try {
+            renderer.close();
+        } catch (Exception e) {
+            LOG.warn("Exception thrown when closing ... {}", e.getMessage());
+        }
+        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",this.getClass().getSimpleName(), e.getMessage());
+            }
+            singletonServiceRegistration = null;
+        }
+    }
+
+    @Override
+    public ServiceGroupIdentifier getIdentifier() {
+        return IDENTIFIER;
+    }
 }

diff --git a/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModule.java b/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModule.java
index 0bb61779f2d3abcf2a663a71d65d11a306addb0a..9bd24389116bee10d0b1ef892f78ab6f94748267 100755 (executable)
--- a/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModule.java
+++ b/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModule.java
@@ -12,7 +12,7 @@ package org.opendaylight.controller.config.yang.config.ofoverlay_provider.impl;
 import org.opendaylight.controller.sal.common.util.NoopAutoCloseable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
+@Deprecated
 public class OFOverlayProviderModule extends org.opendaylight.controller.config.yang.config.ofoverlay_provider.impl.AbstractOFOverlayProviderModule {
     private static final Logger LOG = LoggerFactory
             .getLogger(OFOverlayProviderModule.class);

diff --git a/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModuleFactory.java b/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModuleFactory.java
index d4683f760c19405239b99a289ca44f7d6f83950d..af5620f1e18a52f5cf411ef5599194e64b679021 100644 (file)
--- a/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModuleFactory.java
+++ b/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModuleFactory.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.ofoverlay_provider.impl;
+@Deprecated
 public class OFOverlayProviderModuleFactory extends org.opendaylight.controller.config.yang.config.ofoverlay_provider.impl.AbstractOFOverlayProviderModuleFactory {
 
 }

diff --git a/renderers/ofoverlay/src/main/resources/org/opendaylight/blueprint/of-overlay.xml b/renderers/ofoverlay/src/main/resources/org/opendaylight/blueprint/of-overlay.xml
index 15d7e6fe044135dec3681ad336a27710c40000d9..7627faea0d65b4a0a5d42a299035f8ce6c64575a 100644 (file)
--- a/renderers/ofoverlay/src/main/resources/org/opendaylight/blueprint/of-overlay.xml
+++ b/renderers/ofoverlay/src/main/resources/org/opendaylight/blueprint/of-overlay.xml
@@ -8,11 +8,12 @@
     <reference id="epAugmentation" interface="org.opendaylight.groupbasedpolicy.api.EpRendererAugmentationRegistry"/>
     <reference id="policyValidator" interface="org.opendaylight.groupbasedpolicy.api.PolicyValidatorRegistry"/>
     <reference id="statisticsManager" interface="org.opendaylight.groupbasedpolicy.api.StatisticsManager"/>
+    <reference id="clusterSingletonService" interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
     <odl:rpc-service id="packetProcessing" interface="org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService"/>
     <odl:rpc-service id="salFlowService" interface="org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowService"/>
 
     <bean id="ofOverlay" class="org.opendaylight.controller.config.yang.config.ofoverlay_provider.impl.OFOverlayProviderInstance"
-        destroy-method="close">
+        init-method="initialize" destroy-method="close">
         <argument ref="dataBroker"/>
         <argument ref="packetProcessing"/>
         <argument ref="salFlowService"/>
@@ -20,6 +21,7 @@
         <argument ref="epAugmentation"/>
         <argument ref="policyValidator"/>
         <argument ref="statisticsManager"/>
+        <argument ref="clusterSingletonService"/>
         <argument value="0"/>
     </bean>
 </blueprint>
\ No newline at end of file