X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=loopremover%2Fimplementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fl2switch%2Floopremover%2FLoopRemoverProvider.java;h=1a6ff2caa54bd60016c59f8941b7a5180e967076;hb=9dcc67dfff931ed17bf7533ce59ca9ae9ac04f79;hp=e7851a1f031b1fe33422b09c8c55b1a206293076;hpb=aeb68a5d96bbf19361f423722c4852ad8f3542cf;p=l2switch.git diff --git a/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/LoopRemoverProvider.java b/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/LoopRemoverProvider.java index e7851a1f..1a6ff2ca 100644 --- a/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/LoopRemoverProvider.java +++ b/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/LoopRemoverProvider.java @@ -7,11 +7,11 @@ */ package org.opendaylight.l2switch.loopremover; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.l2switch.loopremover.flow.InitialFlowWriter; import org.opendaylight.l2switch.loopremover.topology.NetworkGraphImpl; import org.opendaylight.l2switch.loopremover.topology.NetworkGraphService; import org.opendaylight.l2switch.loopremover.topology.TopologyLinkDataChangeHandler; +import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowService; import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.loop.remover.config.rev140528.LoopRemoverConfig; import org.opendaylight.yangtools.concepts.Registration; @@ -19,7 +19,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class LoopRemoverProvider { - private static final Logger LOG = LoggerFactory.getLogger(LoopRemoverProvider.class); private final DataBroker dataService; @@ -30,8 +29,7 @@ public class LoopRemoverProvider { private Registration topoNodeListnerReg; private TopologyLinkDataChangeHandler topologyLinkDataChangeHandler; - public LoopRemoverProvider(final DataBroker dataBroker, - final SalFlowService salFlowService, + public LoopRemoverProvider(final DataBroker dataBroker, final SalFlowService salFlowService, final LoopRemoverConfig config) { this.dataService = dataBroker; this.salFlowService = salFlowService; @@ -40,7 +38,7 @@ public class LoopRemoverProvider { public void init() { //Write initial flows - if (loopRemoverConfig.isIsInstallLldpFlow()) { + if (loopRemoverConfig.getIsInstallLldpFlow()) { LOG.info("LoopRemover will install an lldp flow"); InitialFlowWriter initialFlowWriter = new InitialFlowWriter(salFlowService); initialFlowWriter.setFlowTableId(loopRemoverConfig.getLldpFlowTableId()); @@ -53,7 +51,7 @@ public class LoopRemoverProvider { // Register Topology DataChangeListener NetworkGraphService networkGraphService = new NetworkGraphImpl(); this.topologyLinkDataChangeHandler = new TopologyLinkDataChangeHandler(dataService, networkGraphService); - topologyLinkDataChangeHandler.setGraphRefreshDelay(loopRemoverConfig.getGraphRefreshDelay()); + topologyLinkDataChangeHandler.setGraphRefreshDelay(loopRemoverConfig.getGraphRefreshDelay().toJava()); topologyLinkDataChangeHandler.setTopologyId(loopRemoverConfig.getTopologyId()); listenerRegistration = topologyLinkDataChangeHandler.registerAsDataChangeListener();