From 481c5e9c09463a2edf46629b8e1b7fe30bf361f8 Mon Sep 17 00:00:00 2001 From: Vladimir Lavor Date: Mon, 12 Sep 2016 11:37:11 +0200 Subject: [PATCH] Bug 6743: Service group identifier set for neutron-vpp-mapper and vpp-renderer Change-Id: I778842a580d2744c743507428a0d48e1bdbdd4c6 Signed-off-by: Vladimir Lavor --- .../neutron_vpp_mapper/impl/NeutronVppMapperInstance.java | 3 ++- .../yang/config/vpp_provider/impl/GbpVppProviderInstance.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 56fc865a1..badf60b8c 100644 --- 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 f483a03bc..566b5e9e3 100644 --- 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; -- 2.36.6