Code Review
/
netvirt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
NETVIRT-1630 migrate to md-sal APIs
[netvirt.git]
/
vpnmanager
/
impl
/
src
/
main
/
java
/
org
/
opendaylight
/
netvirt
/
vpnmanager
/
FibEntriesListener.java
diff --git
a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java
b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java
index 1164671f87140fabc39b648769975574b0fd363b..c358c89c3ac4655cf8bcf96d904e81d491405b31 100644
(file)
--- a/
vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java
+++ b/
vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/FibEntriesListener.java
@@
-12,15
+12,16
@@
import static org.opendaylight.genius.infra.Datastore.OPERATIONAL;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-import javax.annotation.P
ostConstruct
;
+import javax.annotation.P
reDestroy
;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
+import org.opendaylight.infrautils.utils.concurrent.Executors;
import org.opendaylight.infrautils.utils.concurrent.ListenableFutures;
import org.opendaylight.infrautils.utils.concurrent.ListenableFutures;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.serviceutils.tools.listener.AbstractAsyncDataTreeChangeListener;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.FibEntries;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.fibentries.VrfTables;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.fibentries.VrfTablesKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.FibEntries;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.fibentries.VrfTables;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.fibentries.VrfTablesKey;
@@
-34,7
+35,7
@@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Singleton
import org.slf4j.LoggerFactory;
@Singleton
-public class FibEntriesListener extends A
syncDataTreeChangeListenerBase<VrfEntry, FibEntriesListener
> {
+public class FibEntriesListener extends A
bstractAsyncDataTreeChangeListener<VrfEntry
> {
private static final Logger LOG = LoggerFactory.getLogger(FibEntriesListener.class);
private final DataBroker dataBroker;
private final ManagedNewTransactionRunner txRunner;
private static final Logger LOG = LoggerFactory.getLogger(FibEntriesListener.class);
private final DataBroker dataBroker;
private final ManagedNewTransactionRunner txRunner;
@@
-42,31
+43,28
@@
public class FibEntriesListener extends AsyncDataTreeChangeListenerBase<VrfEntry
@Inject
public FibEntriesListener(final DataBroker dataBroker, final VpnInstanceListener vpnInstanceListener) {
@Inject
public FibEntriesListener(final DataBroker dataBroker, final VpnInstanceListener vpnInstanceListener) {
- super(VrfEntry.class, FibEntriesListener.class);
+ super(dataBroker, LogicalDatastoreType.OPERATIONAL,
+ InstanceIdentifier.create(FibEntries.class).child(VrfTables.class).child(VrfEntry.class),
+ Executors.newListeningSingleThreadExecutor("FibEntriesListener", LOG));
this.dataBroker = dataBroker;
this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
this.vpnInstanceListener = vpnInstanceListener;
}
this.dataBroker = dataBroker;
this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
this.vpnInstanceListener = vpnInstanceListener;
}
- @PostConstruct
public void start() {
LOG.info("{} start", getClass().getSimpleName());
public void start() {
LOG.info("{} start", getClass().getSimpleName());
- registerListener(LogicalDatastoreType.OPERATIONAL, dataBroker);
}
@Override
}
@Override
- protected InstanceIdentifier<VrfEntry> getWildCardPath() {
- return InstanceIdentifier.create(FibEntries.class).child(VrfTables.class).child(VrfEntry.class);
- }
-
- @Override
- protected FibEntriesListener getDataTreeChangeListener() {
- return FibEntriesListener.this;
+ @PreDestroy
+ public void close() {
+ super.close();
+ Executors.shutdownAndAwaitTermination(getExecutorService());
}
@Override
}
@Override
- p
rotected
void remove(InstanceIdentifier<VrfEntry> identifier,
+ p
ublic
void remove(InstanceIdentifier<VrfEntry> identifier,
VrfEntry del) {
LOG.trace("Remove Fib event - Key : {}, value : {} ", identifier, del);
final VrfTablesKey key = identifier.firstKeyOf(VrfTables.class);
VrfEntry del) {
LOG.trace("Remove Fib event - Key : {}, value : {} ", identifier, del);
final VrfTablesKey key = identifier.firstKeyOf(VrfTables.class);
@@
-76,7
+74,7
@@
public class FibEntriesListener extends AsyncDataTreeChangeListenerBase<VrfEntry
}
@Override
}
@Override
- p
rotected
void update(InstanceIdentifier<VrfEntry> identifier,
+ p
ublic
void update(InstanceIdentifier<VrfEntry> identifier,
VrfEntry original, VrfEntry update) {
final VrfTablesKey key = identifier.firstKeyOf(VrfTables.class);
String rd = key.getRouteDistinguisher();
VrfEntry original, VrfEntry update) {
final VrfTablesKey key = identifier.firstKeyOf(VrfTables.class);
String rd = key.getRouteDistinguisher();
@@
-92,7
+90,7
@@
public class FibEntriesListener extends AsyncDataTreeChangeListenerBase<VrfEntry
}
@Override
}
@Override
- p
rotected
void add(InstanceIdentifier<VrfEntry> identifier,
+ p
ublic
void add(InstanceIdentifier<VrfEntry> identifier,
VrfEntry add) {
LOG.trace("Add Vrf Entry event - Key : {}, value : {}", identifier, add);
final VrfTablesKey key = identifier.firstKeyOf(VrfTables.class);
VrfEntry add) {
LOG.trace("Add Vrf Entry event - Key : {}, value : {}", identifier, add);
final VrfTablesKey key = identifier.firstKeyOf(VrfTables.class);