catch and log cluster singleton service registration exceptions

[groupbasedpolicy.git] / neutron-vpp-mapper / src / main / java / org / opendaylight / controller / config / yang / config / neutron_vpp_mapper / impl / NeutronVppMapperInstance.java

diff --git a/neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperInstance.java b/neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperInstance.java
index 56fc865a13aa09f721a6a2894fb228e2aef505f4..0ac9c47c7c7b92f4cd90c0dd1f05ad0912e790c6 100644 (file)
--- a/neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperInstance.java
+++ b/neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperInstance.java
@@ -11,6 +11,7 @@ package org.opendaylight.controller.config.yang.config.neutron_vpp_mapper.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.neutron.vpp.mapper.NeutronVppMapper;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
@@ -25,10 +26,11 @@ public class NeutronVppMapperInstance implements ClusterSingletonService, AutoCl
     private static final Logger LOG = LoggerFactory.getLogger(NeutronVppMapperInstance.class);
 
     private static final ServiceGroupIdentifier IDENTIFIER =
-            ServiceGroupIdentifier.create(NeutronVppMapperInstance.class.getName());
+            ServiceGroupIdentifier.create(GroupbasedpolicyInstance.GBP_SERVICE_GROUP_IDENTIFIER);
     private final DataBroker dataBroker;
     private final String socketPath;
     private final String socketPrefix;
+    private final String routingNode;
     private final ClusterSingletonServiceProvider clusterSingletonService;
     private ClusterSingletonServiceRegistration singletonServiceRegistration;
     private NeutronVppMapper mapper;
@@ -36,22 +38,28 @@ public class NeutronVppMapperInstance implements ClusterSingletonService, AutoCl
     public NeutronVppMapperInstance(final DataBroker dataBroker,
                                     final String socketPath,
                                     final String socketPrefix,
+                                    final String routingNode,
                                     final ClusterSingletonServiceProvider clusterSingletonService) {
         this.dataBroker = Preconditions.checkNotNull(dataBroker);
         this.socketPath = Preconditions.checkNotNull(socketPath);
         this.socketPrefix = Preconditions.checkNotNull(socketPrefix);
+        this.routingNode = Preconditions.checkNotNull(routingNode);
         this.clusterSingletonService = Preconditions.checkNotNull(clusterSingletonService);
     }
 
     public void initialize() {
         LOG.info("Clustering session initiated for {}", this.getClass().getSimpleName());
-        singletonServiceRegistration = clusterSingletonService.registerClusterSingletonService(this);
+        try {
+            singletonServiceRegistration = clusterSingletonService.registerClusterSingletonService(this);
+        } catch (Exception e) {
+            LOG.warn("Exception thrown while registering cluster singleton service in {}", this.getClass(), e.getMessage());
+        }
     }
 
     @Override
     public void instantiateServiceInstance() {
         LOG.info("Instantiating {}", this.getClass().getSimpleName());
-        mapper = new NeutronVppMapper(socketPath, socketPrefix, dataBroker);
+        mapper = new NeutronVppMapper(socketPath, socketPrefix, routingNode, dataBroker);
     }
 
     @Override