import com.google.common.base.Optional;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
+import javax.inject.Singleton;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
import org.opendaylight.genius.datastoreutils.hwvtep.HwvtepClusteredDataTreeChangeListener;
import org.opendaylight.netvirt.elan.l2gw.utils.L2GatewayConnectionUtils;
import org.opendaylight.netvirt.elan.l2gw.utils.SettableFutureCallback;
import org.opendaylight.netvirt.elan.utils.ElanClusterUtils;
-import org.opendaylight.netvirt.elan.utils.ElanUtils;
import org.opendaylight.netvirt.neutronvpn.api.l2gw.L2GatewayDevice;
import org.opendaylight.netvirt.neutronvpn.api.l2gw.utils.L2GatewayCacheUtils;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l2gateways.rev150712.l2gateway.attributes.Devices;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Listener for physical locator presence in operational datastore.
*/
+@Singleton
public class HwvtepTerminationPointListener
- extends HwvtepClusteredDataTreeChangeListener<TerminationPoint, HwvtepTerminationPointListener>
- implements AutoCloseable {
+ extends HwvtepClusteredDataTreeChangeListener<TerminationPoint, HwvtepTerminationPointListener> {
private static final Logger LOG = LoggerFactory.getLogger(HwvtepTerminationPointListener.class);
- private DataBroker broker;
- private ListenerRegistration<DataChangeListener> lstnerRegistration;
+ private final DataBroker broker;
private final ElanL2GatewayUtils elanL2GatewayUtils;
- private final EntityOwnershipService entityOwnershipService;
+ private final ElanClusterUtils elanClusterUtils;
- public HwvtepTerminationPointListener(DataBroker broker, ElanUtils elanUtils,
- EntityOwnershipService entityOwnershipService) {
+ @Inject
+ public HwvtepTerminationPointListener(DataBroker broker, ElanL2GatewayUtils elanL2GatewayUtils,
+ ElanClusterUtils elanClusterUtils) {
super(TerminationPoint.class, HwvtepTerminationPointListener.class);
this.broker = broker;
- this.elanL2GatewayUtils = elanUtils.getElanL2GatewayUtils();
- this.entityOwnershipService = entityOwnershipService;
- registerListener(LogicalDatastoreType.OPERATIONAL, broker);
+ this.elanL2GatewayUtils = elanL2GatewayUtils;
+ this.elanClusterUtils = elanClusterUtils;
+ //No longer needed as port reconciliation is added in plugin
+ //registerListener(LogicalDatastoreType.OPERATIONAL, broker);
LOG.debug("created HwvtepTerminationPointListener");
}
}
}
- @Override
- @SuppressWarnings("checkstyle:IllegalCatch")
- public void close() {
- if (lstnerRegistration != null) {
- try {
- // TODO use https://git.opendaylight.org/gerrit/#/c/44145/ when merged, and remove @SuppressWarnings
- lstnerRegistration.close();
- } catch (final Exception e) {
- LOG.error("Error when cleaning up DataChangeListener.", e);
- }
- lstnerRegistration = null;
- }
- }
-
@Override
protected void removed(InstanceIdentifier<TerminationPoint> identifier, TerminationPoint del) {
LOG.trace("physical locator removed {}", identifier);
del.getAugmentation(HwvtepPhysicalPortAugmentation.class);
if (portAugmentation != null) {
final NodeId nodeId = identifier.firstIdentifierOf(Node.class).firstKeyOf(Node.class).getNodeId();
- ElanClusterUtils.runOnlyInLeaderNode(entityOwnershipService, HwvtepSouthboundConstants.ELAN_ENTITY_NAME,
- "Handling Physical port delete", () ->
- handlePortDeleted(identifier, portAugmentation, del, nodeId));
+ elanClusterUtils.runOnlyInOwnerNode(HwvtepSouthboundConstants.ELAN_ENTITY_NAME,
+ "Handling Physical port delete",
+ () -> handlePortDeleted(identifier, portAugmentation, del, nodeId));
return;
}
}
add.getAugmentation(HwvtepPhysicalPortAugmentation.class);
if (portAugmentation != null) {
final NodeId nodeId = identifier.firstIdentifierOf(Node.class).firstKeyOf(Node.class).getNodeId();
- ElanClusterUtils.runOnlyInLeaderNode(entityOwnershipService, HwvtepSouthboundConstants.ELAN_ENTITY_NAME,
- "handling Physical Switch add", () -> handlePortAdded(portAugmentation, add, nodeId));
+ elanClusterUtils.runOnlyInOwnerNode(HwvtepSouthboundConstants.ELAN_ENTITY_NAME,
+ () -> handlePortAdded(portAugmentation, add, nodeId));
return;
}
String newPortId = portAdded.getTpId().getValue();
NodeId hwvtepNodeId = new NodeId(l2GwDevice.getHwvtepNodeId());
List<VlanBindings> vlanBindings = getVlanBindings(l2GwConns, hwvtepNodeId, psName, newPortId);
- List<ListenableFuture<Void>> futures = new ArrayList<>();
- futures.add(elanL2GatewayUtils.updateVlanBindingsInL2GatewayDevice(hwvtepNodeId, psName,
- newPortId, vlanBindings));
- return futures;
+ return Collections.singletonList(
+ elanL2GatewayUtils.updateVlanBindingsInL2GatewayDevice(hwvtepNodeId, psName, newPortId,
+ vlanBindings));
}
} else {
LOG.error("{} details are not present in L2Gateway Cache", psName);
HwvtepPhysicalPortAugmentation portAugmentation,
TerminationPoint portDeleted,
NodeId psNodeId) throws ReadFailedException {
- List<ListenableFuture<Void>> futures = new ArrayList<>();
InstanceIdentifier<Node> psNodeIid = identifier.firstIdentifierOf(Node.class);
final ReadWriteTransaction tx = broker.newReadWriteTransaction();
final SettableFuture settableFuture = SettableFuture.create();
- futures.add(settableFuture);
- Futures.addCallback(
- tx.read(LogicalDatastoreType.CONFIGURATION, psNodeIid), new SettableFutureCallback(settableFuture) {
+ List<ListenableFuture<Void>> futures = Collections.singletonList(settableFuture);
+ Futures.addCallback(tx.read(LogicalDatastoreType.CONFIGURATION, psNodeIid),
+ new SettableFutureCallback(settableFuture) {
@Override
- public void onSuccess(Object resultNode) {
+ public void onSuccess(@Nonnull Object resultNode) {
Optional<Node> nodeOptional = (Optional<Node>) resultNode;
if (nodeOptional.isPresent()) {
//case of port deleted
tx.delete(LogicalDatastoreType.CONFIGURATION, identifier);
- Futures.addCallback(tx.submit(), new SettableFutureCallback(settableFuture));
+ Futures.addCallback(tx.submit(), new SettableFutureCallback(settableFuture),
+ MoreExecutors.directExecutor());
}
}
- });
+ }, MoreExecutors.directExecutor());
return futures;
}
}
private boolean isL2GatewayConfigured(L2GatewayDevice l2GwDevice) {
- return l2GwDevice.getHwvtepNodeId() != null && l2GwDevice.isConnected()
- && l2GwDevice.getL2GatewayIds().size() > 0 && l2GwDevice.getTunnelIp() != null;
+ return l2GwDevice.getHwvtepNodeId() != null
+ && !l2GwDevice.getL2GatewayIds().isEmpty() && l2GwDevice.getTunnelIp() != null;
}
}
Code Review / netvirt.git / blobdiff