import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter;
import org.opendaylight.openflowjava.protocol.api.connection.ConnectionReadyListener;
+import org.opendaylight.openflowplugin.openflow.md.OFConstants;
import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil;
+import org.opendaylight.openflowplugin.openflow.md.core.session.PortFeaturesUtil;
import org.opendaylight.openflowplugin.openflow.md.core.session.SessionContext;
import org.opendaylight.openflowplugin.openflow.md.core.session.SessionManager;
import org.opendaylight.openflowplugin.openflow.md.queue.QueueKeeper;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OpenflowProtocolListener;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketInMessage;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortGrouping;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortStatusMessage;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestDescBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestGroupBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestGroupFeaturesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestMeterFeaturesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestPortDescBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestDescCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestGroupFeaturesCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestMeterFeaturesCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestPortDescCaseBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.system.rev130927.DisconnectEvent;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.system.rev130927.SwitchIdleEvent;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.system.rev130927.SystemNotificationsListener;
private ConnectionConductor.CONDUCTOR_STATE conductorState;
private Short version;
- private SwitchConnectionDistinguisher auxiliaryKey;
+ protected SwitchConnectionDistinguisher auxiliaryKey;
- private SessionContext sessionContext;
+ protected SessionContext sessionContext;
private QueueKeeper<OfHeader, DataObject> queueKeeper;
private ExecutorService hsPool;
private HandshakeManager handshakeManager;
private boolean firstHelloProcessed;
+
+ private PortFeaturesUtil portFeaturesUtils;
/**
* @param connectionAdapter
ConnectionConductor.versionOrder.get(0), ConnectionConductor.versionOrder);
handshakeManager.setUseVersionBitmap(isBitmapNegotiationEnable);
handshakeManager.setHandshakeListener(this);
+ portFeaturesUtils = PortFeaturesUtil.getInstance();
}
@Override
* then continue connection processing. if no common version found, just disconnect.
* 3. If HelloMessage version is not supported, send HelloMessage with lower supported version.
* 4. If Hello message received again with not supported version, just disconnect.
- *
- * TODO: Better to handle handshake into a maintainable innerclass which uses State-Pattern.
*/
@Override
public synchronized void onHelloMessage(final HelloMessage hello) {
- LOG.debug("processing HELLO.xid{}", hello.getXid());
+ LOG.debug("processing HELLO.xid: {}", hello.getXid());
firstHelloProcessed = true;
checkState(CONDUCTOR_STATE.HANDSHAKING);
HandshakeStepWrapper handshakeStepWrapper = new HandshakeStepWrapper(
hello, handshakeManager, connectionAdapter);
- hsPool.execute(handshakeStepWrapper);
+ hsPool.submit(handshakeStepWrapper);
}
/**
@Override
public void onPacketInMessage(PacketInMessage message) {
- queueKeeper.push(message, this);
+ queueKeeper.push(message, this, QueueKeeper.QueueType.UNORDERED);
}
@Override
public void onPortStatusMessage(PortStatusMessage message) {
- this.getSessionContext().processPortStatusMsg(message);
+ processPortStatusMsg(message);
queueKeeper.push(message, this);
}
+
+ protected void processPortStatusMsg(PortStatus msg) {
+ if (msg.getReason().getIntValue() == 2) {
+ updatePort(msg);
+ } else if (msg.getReason().getIntValue() == 0) {
+ updatePort(msg);
+ } else if (msg.getReason().getIntValue() == 1) {
+ deletePort(msg);
+ }
+ }
+
+ protected void updatePort(PortStatus msg) {
+ Long portNumber = msg.getPortNo();
+ Boolean portBandwidth = portFeaturesUtils.getPortBandwidth(msg);
+
+ if(portBandwidth == null) {
+ LOG.debug("can't get bandwidth info from port: {}, aborting port update", msg.toString());
+ } else {
+ this.getSessionContext().getPhysicalPorts().put(portNumber, msg);
+ this.getSessionContext().getPortsBandwidth().put(portNumber, portBandwidth);
+ }
+ }
+
+ protected void deletePort(PortGrouping port) {
+ Long portNumber = port.getPortNo();
+
+ this.getSessionContext().getPhysicalPorts().remove(portNumber);
+ this.getSessionContext().getPortsBandwidth().remove(portNumber);
+ }
@Override
public void onSwitchIdleEvent(SwitchIdleEvent notification) {
disconnect();
OFSessionUtil.getSessionManager().invalidateOnDisconnect(ConnectionConductorImpl.this);
} else {
- LOG.debug("first idle state occured");
+ LOG.debug("first idle state occured, sessionCtx={}|auxId={}", sessionContext, auxiliaryKey);
EchoInputBuilder builder = new EchoInputBuilder();
builder.setVersion(getVersion());
builder.setXid(getSessionContext().getNextXid());
@Override
public Future<Boolean> disconnect() {
- LOG.info("disconnecting: sessionCtx="+sessionContext+"|auxId="+auxiliaryKey);
+ LOG.trace("disconnecting: sessionCtx={}|auxId={}", sessionContext, auxiliaryKey);
Future<Boolean> result = null;
if (connectionAdapter.isAlive()) {
@Override
public void onHandshakeSuccessfull(GetFeaturesOutput featureOutput,
Short negotiatedVersion) {
+ postHandshakeBasic(featureOutput, negotiatedVersion);
+
+ // post-handshake actions
+ if(version == OFConstants.OFP_VERSION_1_3){
+ requestGroupFeatures();
+ requestMeterFeatures();
+ } else if (version == OFConstants.OFP_VERSION_1_0) {
+ // Because the GetFeaturesOutput contains information about the port
+ // in OF1.0 (that we would otherwise get from the PortDesc) we have to pass
+ // it up for parsing to convert into a NodeConnectorUpdate
+ queueKeeper.push(featureOutput, this);
+ }
+
+ requestDesc();
+ requestPorts();
+ }
+
+ /**
+ * used by tests
+ * @param featureOutput
+ * @param negotiatedVersion
+ */
+ protected void postHandshakeBasic(GetFeaturesOutput featureOutput,
+ Short negotiatedVersion) {
version = negotiatedVersion;
conductorState = CONDUCTOR_STATE.WORKING;
OFSessionUtil.registerSession(this, featureOutput, negotiatedVersion);
- requestDesc();
- requestPorts();
- requestGroupFeatures();
- requestMeterFeatures();
+ hsPool.shutdownNow();
}
/*
builder.setType(MultipartType.OFPMPDESC);
builder.setVersion(getVersion());
builder.setFlags(new MultipartRequestFlags(false));
- builder.setMultipartRequestBody(new MultipartRequestDescBuilder().build());
+ builder.setMultipartRequestBody(new MultipartRequestDescCaseBuilder().build());
builder.setXid(getSessionContext().getNextXid());
getConnectionAdapter().multipartRequest(builder.build());
}
builder.setType(MultipartType.OFPMPPORTDESC);
builder.setVersion(getVersion());
builder.setFlags(new MultipartRequestFlags(false));
- builder.setMultipartRequestBody(new MultipartRequestPortDescBuilder().build());
+ builder.setMultipartRequestBody(new MultipartRequestPortDescCaseBuilder().build());
builder.setXid(getSessionContext().getNextXid());
getConnectionAdapter().multipartRequest(builder.build());
}
mprInput.setFlags(new MultipartRequestFlags(false));
mprInput.setXid(getSessionContext().getNextXid());
- MultipartRequestGroupFeaturesBuilder mprGroupFeaturesBuild = new MultipartRequestGroupFeaturesBuilder();
+ MultipartRequestGroupFeaturesCaseBuilder mprGroupFeaturesBuild =
+ new MultipartRequestGroupFeaturesCaseBuilder();
mprInput.setMultipartRequestBody(mprGroupFeaturesBuild.build());
LOG.debug("Send group features statistics request :{}",mprGroupFeaturesBuild);
mprInput.setFlags(new MultipartRequestFlags(false));
mprInput.setXid(getSessionContext().getNextXid());
- MultipartRequestMeterFeaturesBuilder mprMeterFeaturesBuild = new MultipartRequestMeterFeaturesBuilder();
+ MultipartRequestMeterFeaturesCaseBuilder mprMeterFeaturesBuild =
+ new MultipartRequestMeterFeaturesCaseBuilder();
mprInput.setMultipartRequestBody(mprMeterFeaturesBuild.build());
LOG.debug("Send meter features statistics request :{}",mprMeterFeaturesBuild);
Code Review / openflowplugin.git / blobdiff