Bug 6743: Service group identifier set for neutron-vpp-mapper and vpp-renderer

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

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..badf60b8c96afc5b98138f55f7ebf62e4ecb12a6 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,7 +26,7 @@ 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;

diff --git a/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderInstance.java b/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderInstance.java
index f483a03bc31770f614b9c507d5b9099b1e327825..566b5e9e36295ceaaff4ba925bb45066946471a1 100644 (file)
--- a/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderInstance.java
+++ b/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderInstance.java
@@ -11,6 +11,7 @@ package org.opendaylight.controller.config.yang.config.vpp_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.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
@@ -25,7 +26,7 @@ public class GbpVppProviderInstance implements ClusterSingletonService, AutoClos
     private static final Logger LOG = LoggerFactory.getLogger(GbpVppProviderInstance.class);
 
     private static final ServiceGroupIdentifier IDENTIFIER =
-            ServiceGroupIdentifier.create(GbpVppProviderInstance.class.getName());
+            ServiceGroupIdentifier.create(GroupbasedpolicyInstance.GBP_SERVICE_GROUP_IDENTIFIER);
     private final DataBroker dataBroker;
     private final BindingAwareBroker bindingAwareBroker;
     private final ClusterSingletonServiceProvider clusterSingletonService;