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]
/
elanmanager
/
impl
/
src
/
main
/
java
/
org
/
opendaylight
/
netvirt
/
elan
/
internal
/
ElanTunnelInterfaceStateListener.java
diff --git
a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java
b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java
index 2ea1705665c69583c65dbcd5ac119990024fc8df..f63bfc63282921eef29a5a3bfc3f300c6c55fc05 100644
(file)
--- a/
elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java
+++ b/
elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java
@@
-8,15
+8,16
@@
package org.opendaylight.netvirt.elan.internal;
import java.util.Collections;
package org.opendaylight.netvirt.elan.internal;
import java.util.Collections;
-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.infrautils.jobcoordinator.JobCoordinator;
import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
+import org.opendaylight.infrautils.utils.concurrent.Executors;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.netvirt.elan.utils.ElanConstants;
import org.opendaylight.netvirt.elan.utils.ElanUtils;
import org.opendaylight.netvirt.elan.utils.ElanConstants;
import org.opendaylight.netvirt.elan.utils.ElanUtils;
+import org.opendaylight.serviceutils.tools.listener.AbstractAsyncDataTreeChangeListener;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.TepTypeInternal;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.TunnelOperStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.TunnelsState;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.TepTypeInternal;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.TunnelOperStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.TunnelsState;
@@
-27,8
+28,7
@@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Singleton
import org.slf4j.LoggerFactory;
@Singleton
-public class ElanTunnelInterfaceStateListener extends AsyncDataTreeChangeListenerBase<StateTunnelList,
- ElanTunnelInterfaceStateListener> {
+public class ElanTunnelInterfaceStateListener extends AbstractAsyncDataTreeChangeListener<StateTunnelList> {
private static final Logger LOG = LoggerFactory.getLogger(ElanTunnelInterfaceStateListener.class);
private final DataBroker dataBroker;
private final ElanInterfaceManager elanInterfaceManager;
private static final Logger LOG = LoggerFactory.getLogger(ElanTunnelInterfaceStateListener.class);
private final DataBroker dataBroker;
private final ElanInterfaceManager elanInterfaceManager;
@@
-39,35
+39,37
@@
public class ElanTunnelInterfaceStateListener extends AsyncDataTreeChangeListene
public ElanTunnelInterfaceStateListener(final DataBroker dataBroker,
final ElanInterfaceManager elanInterfaceManager, final ElanUtils elanUtils,
final JobCoordinator jobCoordinator) {
public ElanTunnelInterfaceStateListener(final DataBroker dataBroker,
final ElanInterfaceManager elanInterfaceManager, final ElanUtils elanUtils,
final JobCoordinator jobCoordinator) {
- super(StateTunnelList.class, ElanTunnelInterfaceStateListener.class);
+ super(dataBroker, LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(TunnelsState.class)
+ .child(StateTunnelList.class),
+ Executors.newListeningSingleThreadExecutor("ElanTunnelInterfaceStateListener", LOG));
this.dataBroker = dataBroker;
this.elanInterfaceManager = elanInterfaceManager;
this.elanUtils = elanUtils;
this.jobCoordinator = jobCoordinator;
}
this.dataBroker = dataBroker;
this.elanInterfaceManager = elanInterfaceManager;
this.elanUtils = elanUtils;
this.jobCoordinator = jobCoordinator;
}
- @Override
- @PostConstruct
public void init() {
public void init() {
-
registerListener(LogicalDatastoreType.OPERATIONAL, dataBroker
);
+
LOG.info("{} init", getClass().getSimpleName()
);
}
@Override
}
@Override
- protected InstanceIdentifier<StateTunnelList> getWildCardPath() {
- return InstanceIdentifier.create(TunnelsState.class).child(StateTunnelList.class);
+ @PreDestroy
+ public void close() {
+ super.close();
+ Executors.shutdownAndAwaitTermination(getExecutorService());
}
@Override
}
@Override
- p
rotected
void remove(InstanceIdentifier<StateTunnelList> key, StateTunnelList delete) {
+ p
ublic
void remove(InstanceIdentifier<StateTunnelList> key, StateTunnelList delete) {
}
@Override
}
@Override
- p
rotected
void update(InstanceIdentifier<StateTunnelList> key, StateTunnelList original,
+ p
ublic
void update(InstanceIdentifier<StateTunnelList> key, StateTunnelList original,
StateTunnelList update) {
}
@Override
StateTunnelList update) {
}
@Override
- p
rotected
void add(InstanceIdentifier<StateTunnelList> key, StateTunnelList add) {
+ p
ublic
void add(InstanceIdentifier<StateTunnelList> key, StateTunnelList add) {
LOG.info("processing add state for StateTunnelList {}", add);
if (!isInternalTunnel(add)) {
LOG.trace("tunnel {} is not a internal vxlan tunnel", add);
LOG.info("processing add state for StateTunnelList {}", add);
if (!isInternalTunnel(add)) {
LOG.trace("tunnel {} is not a internal vxlan tunnel", add);
@@
-97,11
+99,6
@@
public class ElanTunnelInterfaceStateListener extends AsyncDataTreeChangeListene
}
}
}
}
- @Override
- protected ElanTunnelInterfaceStateListener getDataTreeChangeListener() {
- return this;
- }
-
private static boolean isInternalTunnel(StateTunnelList stateTunnelList) {
return stateTunnelList.getDstInfo() != null
? stateTunnelList.getDstInfo().getTepDeviceType() == TepTypeInternal.class : false;
private static boolean isInternalTunnel(StateTunnelList stateTunnelList) {
return stateTunnelList.getDstInfo() != null
? stateTunnelList.getDstInfo().getTepDeviceType() == TepTypeInternal.class : false;