From 86fa91e7bdfd98a080d510504b6b9dc78d857987 Mon Sep 17 00:00:00 2001 From: adetalhouet Date: Wed, 18 Nov 2015 16:32:46 -0500 Subject: [PATCH] Instantiate IovisorRenderer in the IovisorProviderModule Change-Id: I74b30556026a5b83427df9a806802528a5289468 Signed-off-by: adetalhouet --- .../impl/IovisorProviderModule.java | 7 +++--- .../renderer/iovisor/IovisorRenderer.java | 24 ++++++------------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModule.java b/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModule.java index 6e1e8088f..5553a1b84 100644 --- a/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModule.java +++ b/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModule.java @@ -1,4 +1,7 @@ package org.opendaylight.controller.config.yang.config.iovisor_provider.impl; + +import org.opendaylight.groupbasedpolicy.renderer.iovisor.IovisorRenderer; + public class IovisorProviderModule extends org.opendaylight.controller.config.yang.config.iovisor_provider.impl.AbstractIovisorProviderModule { public IovisorProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); @@ -15,8 +18,6 @@ public class IovisorProviderModule extends org.opendaylight.controller.config.ya @Override public java.lang.AutoCloseable createInstance() { - // TODO:implement - throw new java.lang.UnsupportedOperationException(); + return new IovisorRenderer(getDataBrokerDependency()); } - } diff --git a/renderers/iovisor/src/main/java/org/opendaylight/groupbasedpolicy/renderer/iovisor/IovisorRenderer.java b/renderers/iovisor/src/main/java/org/opendaylight/groupbasedpolicy/renderer/iovisor/IovisorRenderer.java index e0b1bf84d..ddda3f590 100644 --- a/renderers/iovisor/src/main/java/org/opendaylight/groupbasedpolicy/renderer/iovisor/IovisorRenderer.java +++ b/renderers/iovisor/src/main/java/org/opendaylight/groupbasedpolicy/renderer/iovisor/IovisorRenderer.java @@ -8,12 +8,8 @@ package org.opendaylight.groupbasedpolicy.renderer.iovisor; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; - import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.NotificationService; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; +import org.opendaylight.groupbasedpolicy.renderer.iovisor.endpoint.EndpointManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,24 +20,18 @@ public class IovisorRenderer implements AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(IovisorRenderer.class); - private final DataBroker dataBroker; - private final ScheduledExecutorService executor; - - - public IovisorRenderer(final DataBroker dataProvider, RpcProviderRegistry rpcRegistry, - NotificationService notificationService) { - super(); - this.dataBroker = dataProvider; - - int numCPU = Runtime.getRuntime().availableProcessors(); - executor = Executors.newScheduledThreadPool(numCPU * 2); + private EndpointManager endPointManager; + public IovisorRenderer(final DataBroker dataBroker) { LOG.info("IOVisor Renderer has Started"); + this.endPointManager = new EndpointManager(dataBroker); } @Override public void close() throws Exception { - executor.shutdownNow(); + if (endPointManager != null) { + endPointManager.close(); + } } } -- 2.36.6