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
/
ElanInterfaceConfigListener.java
diff --git
a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceConfigListener.java
b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceConfigListener.java
index 25a6db5d9e787b677426ad101940971f0aacf859..d889d3226f1476ee5c57a8c6155e870ff6c8b1b7 100644
(file)
--- a/
elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceConfigListener.java
+++ b/
elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInterfaceConfigListener.java
@@
-9,20
+9,21
@@
package org.opendaylight.netvirt.elan.internal;
import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
-import com.google.common.base.Optional;
import java.util.Collections;
import java.util.Collections;
-import javax.annotation.PostConstruct;
+import java.util.Optional;
+import javax.annotation.PreDestroy;
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.infrautils.jobcoordinator.JobCoordinator;
import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
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.cache.ElanInterfaceCache;
import org.opendaylight.netvirt.elan.utils.ElanConstants;
import org.opendaylight.netvirt.elan.utils.ElanUtils;
import org.opendaylight.netvirt.elan.cache.ElanInterfaceCache;
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.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlan;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlan;
@@
-33,7
+34,7
@@
import org.slf4j.LoggerFactory;
@Singleton
public class ElanInterfaceConfigListener
@Singleton
public class ElanInterfaceConfigListener
- extends A
syncDataTreeChangeListenerBase<Interface, ElanInterfaceConfigListener
> {
+ extends A
bstractAsyncDataTreeChangeListener<Interface
> {
private static final Logger LOG = LoggerFactory.getLogger(ElanInterfaceConfigListener.class);
private static final Logger LOG = LoggerFactory.getLogger(ElanInterfaceConfigListener.class);
@@
-46,7
+47,9
@@
public class ElanInterfaceConfigListener
@Inject
public ElanInterfaceConfigListener(DataBroker dataBroker, ElanInterfaceManager elanInterfaceManager,
JobCoordinator jobCoordinator, ElanInterfaceCache elanInterfaceCache) {
@Inject
public ElanInterfaceConfigListener(DataBroker dataBroker, ElanInterfaceManager elanInterfaceManager,
JobCoordinator jobCoordinator, ElanInterfaceCache elanInterfaceCache) {
- super(Interface.class, ElanInterfaceConfigListener.class);
+ super(dataBroker, LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Interfaces.class)
+ .child(Interface.class),
+ Executors.newListeningSingleThreadExecutor("ElanInterfaceConfigListener", LOG));
this.dataBroker = dataBroker;
this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
this.elanInterfaceManager = elanInterfaceManager;
this.dataBroker = dataBroker;
this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
this.elanInterfaceManager = elanInterfaceManager;
@@
-54,20
+57,12
@@
public class ElanInterfaceConfigListener
this.elanInterfaceCache = elanInterfaceCache;
}
this.elanInterfaceCache = elanInterfaceCache;
}
- @Override
- @PostConstruct
public void init() {
LOG.info("ElanInterfaceConfigListener init");
public void init() {
LOG.info("ElanInterfaceConfigListener init");
- registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
}
@Override
}
@Override
- protected InstanceIdentifier<Interface> getWildCardPath() {
- return InstanceIdentifier.create(Interfaces.class).child(Interface.class);
- }
-
- @Override
- protected void remove(InstanceIdentifier<Interface> key, Interface intrf) {
+ public void remove(InstanceIdentifier<Interface> key, Interface intrf) {
// Sometimes elan service is not unbound on the interface when the user does nova delete followed
// by neutron port delete since interface config is deleted a bit later. so adding logic to
// unbind service for interface config removal.
// Sometimes elan service is not unbound on the interface when the user does nova delete followed
// by neutron port delete since interface config is deleted a bit later. so adding logic to
// unbind service for interface config removal.
@@
-90,19
+85,20
@@
public class ElanInterfaceConfigListener
}
@Override
}
@Override
- p
rotected
void update(InstanceIdentifier<Interface> key, Interface dataObjectModificationBefore,
+ p
ublic
void update(InstanceIdentifier<Interface> key, Interface dataObjectModificationBefore,
Interface dataObjectModificationAfter) {
// Not required to handle this event
}
@Override
Interface dataObjectModificationAfter) {
// Not required to handle this event
}
@Override
- p
rotected
void add(InstanceIdentifier<Interface> key, Interface dataObjectModification) {
+ p
ublic
void add(InstanceIdentifier<Interface> key, Interface dataObjectModification) {
// Not required to handle this event
}
@Override
// Not required to handle this event
}
@Override
- protected ElanInterfaceConfigListener getDataTreeChangeListener() {
- return this;
+ @PreDestroy
+ public void close() {
+ super.close();
+ Executors.shutdownAndAwaitTermination(getExecutorService());
}
}
-
}
}