From 949c56ebdcbda1e0b3f78d18b00afa245d76f4b5 Mon Sep 17 00:00:00 2001 From: Matej Perina Date: Thu, 18 Aug 2016 17:29:03 +0200 Subject: [PATCH] BUG 6466 removed unnecessary constant from config Change-Id: I66e08b1470ba0a6de309d658f5cf1983fbb3d57f Signed-off-by: Matej Perina --- renderers/ios-xe/src/main/config/default-config.xml | 2 -- .../ios_xe_provider/impl/IosXeRendererProviderImpl.java | 7 ++----- .../ios_xe_provider/impl/config/IosXeProviderModule.java | 2 +- .../impl/listener/RendererConfigurationListenerImpl.java | 5 +++-- renderers/ios-xe/src/main/yang/ios-xe-provider-impl.yang | 4 ---- .../listener/RendererConfigurationListenerImplTest.java | 4 +--- 6 files changed, 7 insertions(+), 17 deletions(-) diff --git a/renderers/ios-xe/src/main/config/default-config.xml b/renderers/ios-xe/src/main/config/default-config.xml index 218d476e5..a22f5c7ab 100755 --- a/renderers/ios-xe/src/main/config/default-config.xml +++ b/renderers/ios-xe/src/main/config/default-config.xml @@ -33,8 +33,6 @@ gbp:policy-validator-registry policy-validator-registry - - ios-xe-renderer diff --git a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/IosXeRendererProviderImpl.java b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/IosXeRendererProviderImpl.java index 7604d8ad2..e6075f335 100644 --- a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/IosXeRendererProviderImpl.java +++ b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/IosXeRendererProviderImpl.java @@ -56,15 +56,12 @@ public class IosXeRendererProviderImpl implements IosXeRendererProvider, Binding private static final Logger LOG = LoggerFactory.getLogger(IosXeRendererProviderImpl.class); private final DataBroker dataBroker; - private final RendererName rendererName; private RendererConfigurationListenerImpl rendererConfigurationListener; private IosXeCapableNodeListenerImpl iosXeCapableNodeListener; - public IosXeRendererProviderImpl(final DataBroker dataBroker, final BindingAwareBroker broker, - final RendererName rendererName) { + public IosXeRendererProviderImpl(final DataBroker dataBroker, final BindingAwareBroker broker) { LOG.debug("ios-xe renderer bootstrap"); this.dataBroker = Preconditions.checkNotNull(dataBroker, "missing dataBroker dependency"); - this.rendererName = Preconditions.checkNotNull(rendererName, "missing rendererName param"); broker.registerProvider(this); } @@ -94,7 +91,7 @@ public class IosXeRendererProviderImpl implements IosXeRendererProvider, Binding final PolicyManager policyManagerZip = new PolicyManagerZipImpl(policyManager); // renderer-configuration endpoints - rendererConfigurationListener = new RendererConfigurationListenerImpl(dataBroker, rendererName, policyManagerZip); + rendererConfigurationListener = new RendererConfigurationListenerImpl(dataBroker, policyManagerZip); // supported node list maintenance // TODO: upkeep of available renderer-nodes diff --git a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderModule.java b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderModule.java index c65289202..b49b0dc0f 100644 --- a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderModule.java +++ b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderModule.java @@ -26,7 +26,7 @@ public class IosXeProviderModule extends org.opendaylight.groupbasedpolicy.rende @Override public java.lang.AutoCloseable createInstance() { - return new IosXeRendererProviderImpl(getDataBrokerDependency(), getBrokerDependency(), getRendererName()); + return new IosXeRendererProviderImpl(getDataBrokerDependency(), getBrokerDependency()); } } diff --git a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/listener/RendererConfigurationListenerImpl.java b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/listener/RendererConfigurationListenerImpl.java index 6daf50d81..4dca17bca 100644 --- a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/listener/RendererConfigurationListenerImpl.java +++ b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/listener/RendererConfigurationListenerImpl.java @@ -16,6 +16,7 @@ import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier; import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.api.manager.PolicyManager; +import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.manager.PolicyManagerImpl; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.RendererName; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.Renderers; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.Renderer; @@ -40,11 +41,11 @@ public class RendererConfigurationListenerImpl implements DataTreeChangeListener private final ListenerRegistration listenerRegistration; private final PolicyManager policyManager; - public RendererConfigurationListenerImpl(final DataBroker dataBroker, final RendererName rendererName, + public RendererConfigurationListenerImpl(final DataBroker dataBroker, final PolicyManager policyManager) { this.policyManager = Preconditions.checkNotNull(policyManager, "missing endpoint template cache"); final InstanceIdentifier policyPath = InstanceIdentifier.create(Renderers.class) - .child(Renderer.class, new RendererKey(rendererName)) + .child(Renderer.class, new RendererKey(PolicyManagerImpl.IOS_XE_RENDERER)) .child(RendererPolicy.class); final DataTreeIdentifier treePath = new DataTreeIdentifier<>( diff --git a/renderers/ios-xe/src/main/yang/ios-xe-provider-impl.yang b/renderers/ios-xe/src/main/yang/ios-xe-provider-impl.yang index 355ff1156..423d8feed 100755 --- a/renderers/ios-xe/src/main/yang/ios-xe-provider-impl.yang +++ b/renderers/ios-xe/src/main/yang/ios-xe-provider-impl.yang @@ -62,10 +62,6 @@ module ios-xe-provider-impl { } } } - - leaf renderer-name { - type gbprenderer:renderer-name; - } } } } diff --git a/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/listener/RendererConfigurationListenerImplTest.java b/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/listener/RendererConfigurationListenerImplTest.java index 303bc8c55..dd5f854e4 100644 --- a/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/listener/RendererConfigurationListenerImplTest.java +++ b/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/listener/RendererConfigurationListenerImplTest.java @@ -23,7 +23,6 @@ import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier; import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.manager.PolicyManagerImpl; -import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.RendererName; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.RendererPolicy; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.RendererPolicyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.ConfigurationBuilder; @@ -37,7 +36,6 @@ import org.opendaylight.yangtools.concepts.ListenerRegistration; @RunWith(MockitoJUnitRunner.class) public class RendererConfigurationListenerImplTest { - private static final RendererName RENDERER_NAME = new RendererName("renderer1"); private final RendererPolicy policy1; private final RendererPolicy policy2; @Mock @@ -83,7 +81,7 @@ public class RendererConfigurationListenerImplTest { Matchers.>any(), Matchers.any())) .thenReturn(listenerRegistration); - listener = new RendererConfigurationListenerImpl(dataBroker, RENDERER_NAME, policyManager); + listener = new RendererConfigurationListenerImpl(dataBroker, policyManager); Mockito.verify(dataBroker).registerDataTreeChangeListener(Matchers.>any(), Matchers.any()); } -- 2.36.6