-/**
+/*
* Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.impl.connection;
import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
-import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter;
import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueue;
import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueueHandlerRegistration;
import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
+import org.opendaylight.openflowplugin.api.openflow.connection.DeviceConnectionStatusProvider;
import org.opendaylight.openflowplugin.api.openflow.connection.HandshakeContext;
import org.opendaylight.openflowplugin.api.openflow.connection.OutboundQueueProvider;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FeaturesReply;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortStatusMessage;
import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint64;
+import org.opendaylight.yangtools.yang.common.Uint8;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- *
- */
public class ConnectionContextImpl implements ConnectionContext {
private final ConnectionAdapter connectionAdapter;
private OutboundQueueHandlerRegistration<OutboundQueueProvider> outboundQueueHandlerRegistration;
private HandshakeContext handshakeContext;
private DeviceInfo deviceInfo;
- private List<PortStatusMessage> portStatusMessages = new ArrayList<>();
+ private final List<PortStatusMessage> portStatusMessages = new ArrayList<>();
+ private final DeviceConnectionStatusProvider deviceConnectionStatusProvider;
/**
- * @param connectionAdapter
+ * Constructor.
+ *
+ * @param connectionAdapter - connection adapter
*/
- public ConnectionContextImpl(final ConnectionAdapter connectionAdapter) {
+ public ConnectionContextImpl(final ConnectionAdapter connectionAdapter,
+ final DeviceConnectionStatusProvider deviceConnectionStatusProvider) {
this.connectionAdapter = connectionAdapter;
+ this.deviceConnectionStatusProvider = deviceConnectionStatusProvider;
}
@Override
}
@Override
- public void setFeatures(final FeaturesReply featuresReply) {
- this.featuresReply = featuresReply;
+ public void setFeatures(final FeaturesReply newFeaturesReply) {
+ this.featuresReply = newFeaturesReply;
}
@Override
private void closeHandshakeContext() {
LOG.debug("Trying closing handshake context for node {}", getSafeNodeIdForLOG());
if (handshakeContext != null) {
- try {
- handshakeContext.close();
- } catch (Exception e) {
- LOG.error("handshake context closing failed:{} ", e);
- } finally {
- handshakeContext = null;
- }
+ handshakeContext.close();
+ handshakeContext = null;
}
}
private void disconnectDevice(final boolean propagate,
final boolean forced) {
- final String device = Objects.nonNull(nodeId) ? nodeId.getValue() : getConnectionAdapter().getRemoteAddress().toString();
- final short auxiliaryId = Optional
- .ofNullable(getFeatures())
- .flatMap(features -> Optional
- .ofNullable(features.getAuxiliaryId()))
- .orElse((short) 0);
+ final String device = nodeId != null ? nodeId.getValue() : getConnectionAdapter().getRemoteAddress().toString();
+
+ final Uint8 auxiliaryId;
+ if (featuresReply != null) {
+ final Uint8 id = featuresReply.getAuxiliaryId();
+ auxiliaryId = id == null ? Uint8.ZERO : id;
+ } else {
+ auxiliaryId = Uint8.ZERO;
+ }
if (connectionState == CONNECTION_STATE.RIP) {
LOG.debug("Connection for device {} with auxiliary ID {} is already {}, so skipping closing.",
return;
}
+ connectionState = ConnectionContext.CONNECTION_STATE.RIP;
+
SessionStatistics.countEvent(device, forced
? SessionStatistics.ConnectionStatus.CONNECTION_DISCONNECTED_BY_OFP
: SessionStatistics.ConnectionStatus.CONNECTION_DISCONNECTED_BY_DEVICE);
- connectionState = ConnectionContext.CONNECTION_STATE.RIP;
-
LOG.debug("{}: device={} | auxiliaryId={} | connectionState={}",
forced ? "Actively closing connection" : "Disconnecting",
device,
}
private void propagateDeviceDisconnectedEvent() {
- if (Objects.nonNull(deviceDisconnectedHandler)) {
- final BigInteger datapathId = featuresReply != null ? featuresReply.getDatapathId() : BigInteger.ZERO;
+ if (deviceDisconnectedHandler != null) {
+ final Uint64 datapathId = featuresReply != null ? featuresReply.getDatapathId() : Uint64.ZERO;
if (LOG.isDebugEnabled()) {
LOG.debug("Propagating connection closed event: {}, datapathId:{}.",
connectionAdapter.getRemoteAddress(), datapathId);
}
/**
- * This method returns safe nodeId for logging
+ * Get safe nodeId for logging.
+ *
* @return string value od nodeId or string "null"
*/
@Override
public String getSafeNodeIdForLOG() {
- return Objects.nonNull(nodeId) ? nodeId.getValue() : "null";
+ return nodeId == null ? "null" : nodeId.getValue();
}
@Override
- public void setOutboundQueueHandleRegistration(OutboundQueueHandlerRegistration<OutboundQueueProvider> outboundQueueHandlerRegistration) {
- this.outboundQueueHandlerRegistration = outboundQueueHandlerRegistration;
+ public void setOutboundQueueHandleRegistration(
+ final OutboundQueueHandlerRegistration<OutboundQueueProvider> newRegistration) {
+ this.outboundQueueHandlerRegistration = newRegistration;
}
private void unregisterOutboundQueue() {
if (LOG.isDebugEnabled()) {
- LOG.debug("Trying unregister outbound queue handler registration for node {}", nodeId);
+ LOG.debug("Trying unregister outbound queue handler registration for node {}", getSafeNodeIdForLOG());
}
if (outboundQueueHandlerRegistration != null) {
outboundQueueHandlerRegistration.close();
@Override
public void handlePortStatusMessage(final PortStatusMessage portStatusMessage) {
LOG.info("Received early port status message for node {} with reason {} and state {}",
- nodeId.getValue(),
+ getSafeNodeIdForLOG(),
portStatusMessage.getReason(),
MoreObjects.firstNonNull(portStatusMessage.getState(), portStatusMessage.getStateV10()));
}
@Override
- public void setHandshakeContext(HandshakeContext handshakeContext) {
+ public void setHandshakeContext(final HandshakeContext handshakeContext) {
this.handshakeContext = handshakeContext;
}
@Override
- public boolean equals(Object o) {
- if (this == o) {
+ public boolean equals(final Object object) {
+ if (this == object) {
return true;
}
- if (o == null || getClass() != o.getClass()) {
+ if (object == null || getClass() != object.getClass()) {
return false;
}
- ConnectionContextImpl that = (ConnectionContextImpl) o;
+ ConnectionContextImpl that = (ConnectionContextImpl) object;
if (!connectionAdapter.equals(that.connectionAdapter)) {
return false;
return result;
}
- private class DeviceInfoImpl implements DeviceInfo {
+ private static class DeviceInfoImpl implements DeviceInfo {
private final NodeId nodeId;
private final KeyedInstanceIdentifier<Node, NodeKey> nodeII;
- private final Short version;
- private final BigInteger datapathId;
+ private final Uint8 version;
+ private final Uint64 datapathId;
private final ServiceGroupIdentifier serviceGroupIdentifier;
private OutboundQueue outboundQueueProvider;
DeviceInfoImpl(
final NodeId nodeId,
final KeyedInstanceIdentifier<Node, NodeKey> nodeII,
- final Short version,
- final BigInteger datapathId,
+ final Uint8 version,
+ final Uint64 datapathId,
final OutboundQueue outboundQueueProvider) {
this.nodeId = nodeId;
this.nodeII = nodeII;
@Override
public short getVersion() {
- return version;
+ return version.toJava();
}
@Override
- public BigInteger getDatapathId() {
+ public Uint64 getDatapathId() {
return datapathId;
}
}
@Override
- public boolean equals(Object o) {
- if (this == o) {
+ public boolean equals(final Object object) {
+ if (this == object) {
return true;
}
- if (o == null || getClass() != o.getClass()) {
+ if (object == null || getClass() != object.getClass()) {
return false;
}
- DeviceInfoImpl that = (DeviceInfoImpl) o;
+ DeviceInfoImpl that = (DeviceInfoImpl) object;
- return (nodeId.equals(that.nodeId) &&
- nodeII.equals(that.nodeII) &&
- version.equals(that.version) &&
- datapathId.equals(that.datapathId));
+ return nodeId.equals(that.nodeId)
+ && nodeII.equals(that.nodeII)
+ && version.equals(that.version)
+ && datapathId.equals(that.datapathId);
}
@Override
public String toString() {
- return getLOGValue();
+ return nodeId == null ? "null" : getNodeId().getValue();
}
public void setOutboundQueueProvider(final OutboundQueue outboundQueueProvider) {
Code Review / openflowplugin.git / blobdiff