Code Review
/
netvirt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Changed the AsyncDataChangeListenerBase to
[netvirt.git]
/
vpnservice
/
natservice
/
natservice-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
netvirt
/
natservice
/
internal
/
NatNodeEventListener.java
diff --git
a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatNodeEventListener.java
b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatNodeEventListener.java
index 52b2df364684a8bc4f0c4dfd4d16c0ce478d8088..6d680e8a3af5b4a09516d8ef112233af73fa889b 100644
(file)
--- a/
vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatNodeEventListener.java
+++ b/
vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatNodeEventListener.java
@@
-12,7
+12,7
@@
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.genius.
mdsalutil.AbstractDataChangeListener
;
+import org.opendaylight.genius.
datastoreutils.AsyncDataTreeChangeListenerBase
;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
@@
-21,46
+21,45
@@
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class NatNodeEventListener extends AbstractDataChangeListener<Node> implements AutoCloseable {
+import java.math.BigInteger;
+
+public class NatNodeEventListener extends AsyncDataTreeChangeListenerBase<Node, NatNodeEventListener> implements
+ AutoCloseable {
private static final Logger LOG = LoggerFactory.getLogger(NatNodeEventListener.class);
private ListenerRegistration<DataChangeListener> listenerRegistration;
private final DataBroker dataBroker;
public NatNodeEventListener(final DataBroker dataBroker) {
private static final Logger LOG = LoggerFactory.getLogger(NatNodeEventListener.class);
private ListenerRegistration<DataChangeListener> listenerRegistration;
private final DataBroker dataBroker;
public NatNodeEventListener(final DataBroker dataBroker) {
- super(Node.class);
+ super(Node.class
, NatNodeEventListener.class
);
this.dataBroker = dataBroker;
}
public void init() {
LOG.info("{} init", getClass().getSimpleName());
this.dataBroker = dataBroker;
}
public void init() {
LOG.info("{} init", getClass().getSimpleName());
- listenerRegistration = dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL,
- getWildCardPath(), this, AsyncDataBroker.DataChangeScope.SUBTREE);
+ registerListener(LogicalDatastoreType.OPERATIONAL, dataBroker);
}
}
- private InstanceIdentifier<Node> getWildCardPath() {
+ @Override
+ protected InstanceIdentifier<Node> getWildCardPath() {
return InstanceIdentifier.create(Nodes.class).child(Node.class);
}
@Override
return InstanceIdentifier.create(Nodes.class).child(Node.class);
}
@Override
- public void close() throws Exception {
- if (listenerRegistration != null) {
- listenerRegistration.close();
- listenerRegistration = null;
- }
- LOG.info("{} close", getClass().getSimpleName());
+ protected NatNodeEventListener getDataTreeChangeListener() {
+ return NatNodeEventListener.this;
}
@Override
protected void remove(InstanceIdentifier<Node> identifier, Node del) {
}
@Override
protected void remove(InstanceIdentifier<Node> identifier, Node del) {
- LOG.debug("NatNodeEventListener: Node removed received");
+ LOG.debug("N
AT Service : N
atNodeEventListener: Node removed received");
NodeId nodeId = del.getId();
String[] node = nodeId.getValue().split(":");
if(node.length < 2) {
NodeId nodeId = del.getId();
String[] node = nodeId.getValue().split(":");
if(node.length < 2) {
- LOG.warn("Unexpected nodeId {}", nodeId.getValue());
+ LOG.warn("
NAT Service :
Unexpected nodeId {}", nodeId.getValue());
return;
}
BigInteger dpnId = new BigInteger(node[1]);
return;
}
BigInteger dpnId = new BigInteger(node[1]);
- LOG.debug("NodeId removed is {}",dpnId);
+ LOG.debug("N
AT Service : N
odeId removed is {}",dpnId);
}
@Override
}
@Override
@@
-69,14
+68,14
@@
public class NatNodeEventListener extends AbstractDataChangeListener<Node> imple
@Override
protected void add(InstanceIdentifier<Node> identifier, Node add) {
@Override
protected void add(InstanceIdentifier<Node> identifier, Node add) {
- LOG.debug("NatNodeEventListener: Node added received");
+ LOG.debug("N
AT Service : N
atNodeEventListener: Node added received");
NodeId nodeId = add.getId();
String[] node = nodeId.getValue().split(":");
if(node.length < 2) {
NodeId nodeId = add.getId();
String[] node = nodeId.getValue().split(":");
if(node.length < 2) {
- LOG.warn("Unexpected nodeId {}", nodeId.getValue());
+ LOG.warn("
NAT Service :
Unexpected nodeId {}", nodeId.getValue());
return;
}
BigInteger dpnId = new BigInteger(node[1]);
return;
}
BigInteger dpnId = new BigInteger(node[1]);
- LOG.debug("NodeId added is {}",dpnId);
+ LOG.debug("N
AT Service : N
odeId added is {}",dpnId);
}
}
}
}