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
/
ElanInterfaceStateClusteredListener.java
diff --git
a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateClusteredListener.java
b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateClusteredListener.java
index 5d5011f784c9e85cbe779370e980d20af73e7fff..952e45a2ea20099eccf2d92d91c36cb27c58a08b 100644
(file)
--- a/
elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateClusteredListener.java
+++ b/
elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceStateClusteredListener.java
@@
-7,14
+7,15
@@
*/
package org.opendaylight.netvirt.elan.internal;
*/
package org.opendaylight.netvirt.elan.internal;
-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.AsyncClusteredDataTreeChangeListenerBas
e;
+import org.opendaylight.
infrautils.utils.concurrent.Executors
;
+import org.opendaylight.
mdsal.binding.api.DataBroker
;
+import org.opendaylight.
mdsal.common.api.LogicalDatastoreTyp
e;
import org.opendaylight.netvirt.elan.utils.ElanClusterUtils;
import org.opendaylight.netvirt.elan.utils.ElanUtils;
import org.opendaylight.netvirt.elan.utils.ElanClusterUtils;
import org.opendaylight.netvirt.elan.utils.ElanUtils;
+import org.opendaylight.serviceutils.tools.listener.AbstractClusteredAsyncDataTreeChangeListener;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
@@
-25,7
+26,7
@@
import org.slf4j.LoggerFactory;
@Singleton
public class ElanInterfaceStateClusteredListener extends
@Singleton
public class ElanInterfaceStateClusteredListener extends
-
AsyncClusteredDataTreeChangeListenerBase<Interface, ElanInterfaceStateClusteredListener
> {
+
AbstractClusteredAsyncDataTreeChangeListener<Interface
> {
private static final Logger LOG = LoggerFactory.getLogger(ElanInterfaceStateClusteredListener.class);
private static final Logger LOG = LoggerFactory.getLogger(ElanInterfaceStateClusteredListener.class);
@@
-41,33
+42,37
@@
public class ElanInterfaceStateClusteredListener extends
@Inject
public ElanInterfaceStateClusteredListener(DataBroker broker, ElanInterfaceManager elanInterfaceManager,
ElanUtils elanUtils, ElanClusterUtils elanClusterUtils) {
@Inject
public ElanInterfaceStateClusteredListener(DataBroker broker, ElanInterfaceManager elanInterfaceManager,
ElanUtils elanUtils, ElanClusterUtils elanClusterUtils) {
+ super(broker, LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(InterfacesState.class)
+ .child(Interface.class),
+ Executors.newListeningSingleThreadExecutor("ElanInterfaceStateClusteredListener", LOG));
this.broker = broker;
this.elanInterfaceManager = elanInterfaceManager;
this.elanUtils = elanUtils;
this.elanClusterUtils = elanClusterUtils;
}
this.broker = broker;
this.elanInterfaceManager = elanInterfaceManager;
this.elanUtils = elanUtils;
this.elanClusterUtils = elanClusterUtils;
}
- @PostConstruct
public void init() {
public void init() {
-
registerListener(LogicalDatastoreType.OPERATIONAL, broker
);
+
LOG.info("{} registered", getClass().getSimpleName()
);
}
@Override
}
@Override
- public InstanceIdentifier<Interface> getWildCardPath() {
- return InstanceIdentifier.create(InterfacesState.class).child(Interface.class);
+ @PreDestroy
+ public void close() {
+ super.close();
+ Executors.shutdownAndAwaitTermination(getExecutorService());
}
@Override
}
@Override
- p
rotected
void remove(InstanceIdentifier<Interface> identifier, Interface delIf) {
+ p
ublic
void remove(InstanceIdentifier<Interface> identifier, Interface delIf) {
}
@Override
}
@Override
- p
rotected
void update(InstanceIdentifier<Interface> identifier, Interface original, final Interface update) {
+ p
ublic
void update(InstanceIdentifier<Interface> identifier, Interface original, final Interface update) {
add(identifier, update);
}
@Override
add(identifier, update);
}
@Override
- p
rotected
void add(InstanceIdentifier<Interface> identifier, final Interface intrf) {
+ p
ublic
void add(InstanceIdentifier<Interface> identifier, final Interface intrf) {
if (intrf.getType() != null && intrf.getType().equals(Tunnel.class)) {
if (Interface.OperStatus.Up.equals(intrf.getOperStatus())) {
final String interfaceName = intrf.getName();
if (intrf.getType() != null && intrf.getType().equals(Tunnel.class)) {
if (Interface.OperStatus.Up.equals(intrf.getOperStatus())) {
final String interfaceName = intrf.getName();
@@
-94,9
+99,4
@@
public class ElanInterfaceStateClusteredListener extends
/* (non-Javadoc)
* @see org.opendaylight.genius.datastoreutils.AsyncClusteredDataTreeChangeListenerBase#getDataTreeChangeListener()
*/
/* (non-Javadoc)
* @see org.opendaylight.genius.datastoreutils.AsyncClusteredDataTreeChangeListenerBase#getDataTreeChangeListener()
*/
- @Override
- protected ElanInterfaceStateClusteredListener getDataTreeChangeListener() {
- return this;
- }
-
}
}