import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher;
import org.opendaylight.openflowplugin.api.openflow.md.core.sal.NotificationComposer;
import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
-import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.GroupConvertor;
import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.MeterConvertor;
import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.PortConvertor;
* @param taskContext task context
* @param input flow object input
* @param cookie switch connection distinguisher cookie value
+ * @param convertorExecutor
* @return UpdateFlow task
*/
public static OFRpcTask<AddFlowInput, RpcResult<UpdateFlowOutput>> createAddFlowTask(
OFRpcTaskContext taskContext, AddFlowInput input,
- SwitchConnectionDistinguisher cookie) {
+ SwitchConnectionDistinguisher cookie, ConvertorExecutor convertorExecutor) {
class OFRpcTaskImpl extends OFRpcTask<AddFlowInput, RpcResult<UpdateFlowOutput>> {
- public OFRpcTaskImpl(OFRpcTaskContext taskContext, SwitchConnectionDistinguisher cookie, AddFlowInput input) {
+ private final ConvertorExecutor convertorExecutor;
+ private final VersionDatapathIdConvertorData data;
+
+ public OFRpcTaskImpl(OFRpcTaskContext taskContext, SwitchConnectionDistinguisher cookie, AddFlowInput input, ConvertorExecutor convertorExecutor) {
super(taskContext, cookie, input);
+ this.convertorExecutor = convertorExecutor;
+ data = new VersionDatapathIdConvertorData(getVersion());
+ data.setDatapathId(getSession().getFeatures().getDatapathId());
}
@Override
public ListenableFuture<RpcResult<UpdateFlowOutput>> call() {
ListenableFuture<RpcResult<UpdateFlowOutput>> result = SettableFuture.create();
- final VersionDatapathIdConvertorData data = new VersionDatapathIdConvertorData(getVersion());
- data.setDatapathId(getSession().getFeatures().getDatapathId());
// Convert the AddFlowInput to FlowModInput
final java.util.Optional<List<FlowModInputBuilder>> ofFlowModInputs =
- ConvertorManager.getInstance().convert(getInput(), data);
+ convertorExecutor.convert(getInput(), data);
final List<FlowModInputBuilder> flowModInputs = ofFlowModInputs.orElse(Collections.emptyList());
LOG.debug("Number of flows to push to switch: {}", flowModInputs.size());
}
}
- return new OFRpcTaskImpl(taskContext, cookie, input);
+ return new OFRpcTaskImpl(taskContext, cookie, input, convertorExecutor);
}
/**
- * Recursive helper method for {@link OFRpcTaskFactory#createAddFlowTask(OFRpcTaskContext, AddFlowInput, SwitchConnectionDistinguisher)}
- * and {@link OFRpcTaskFactory#createUpdateFlowTask(OFRpcTaskContext, UpdateFlowInput, SwitchConnectionDistinguisher, ReadWriteTransaction)} to chain results
+ * Recursive helper method for {@link OFRpcTaskFactory#createAddFlowTask(OFRpcTaskContext, org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowInput, org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher, org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor)}
+ * and {@link OFRpcTaskFactory#createUpdateFlowTask(OFRpcTaskContext, org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.UpdateFlowInput, org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher, org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction, org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor)} to chain results
* of multiple flowmods.
* The next flowmod gets executed if the earlier one is successful.
* All the flowmods should have the same xid, in-order to cross-reference
* @param input update flow input
* @param cookie switch connection distinguisher cookie value
* @param rwTx read write transaction
+ * @param convertorExecutor
* @return UpdateFlow task
*/
public static OFRpcTask<UpdateFlowInput, RpcResult<UpdateFlowOutput>> createUpdateFlowTask(
final OFRpcTaskContext taskContext, UpdateFlowInput input,
- SwitchConnectionDistinguisher cookie, final ReadWriteTransaction rwTx) {
+ SwitchConnectionDistinguisher cookie, final ReadWriteTransaction rwTx, ConvertorExecutor convertorExecutor) {
class OFRpcTaskImpl extends OFRpcTask<UpdateFlowInput, RpcResult<UpdateFlowOutput>> {
final ReadWriteTransaction rwTx;
+ private final ConvertorExecutor convertorExecutor;
+ private final VersionDatapathIdConvertorData data;
InstanceIdentifier<Table> iiToTable = null;
String flowId = null;
public OFRpcTaskImpl(OFRpcTaskContext taskContext, SwitchConnectionDistinguisher cookie,
- final UpdateFlowInput in, final ReadWriteTransaction rwTx) {
+ final UpdateFlowInput in, final ReadWriteTransaction rwTx, ConvertorExecutor convertorExecutor) {
super(taskContext, cookie, in);
+ this.convertorExecutor = convertorExecutor;
final FlowRef flowRef = in.getFlowRef();
if (flowRef != null) {
InstanceIdentifier<Flow> iiToFlow = (InstanceIdentifier<Flow>)(flowRef.getValue());
}
}
this.rwTx = rwTx;
+ data = new VersionDatapathIdConvertorData(getVersion());
+ data.setDatapathId(getSession().getFeatures().getDatapathId());
}
@Override
UpdateFlowInput in = getInput();
UpdatedFlow updated = in.getUpdatedFlow();
OriginalFlow original = in.getOriginalFlow();
- Short version = getVersion();
List<FlowModInputBuilder> allFlowMods = new ArrayList<>();
java.util.Optional<List<FlowModInputBuilder>> ofFlowModInputs;
- final VersionDatapathIdConvertorData data = new VersionDatapathIdConvertorData(version);
- data.setDatapathId(getSession().getFeatures().getDatapathId());
- if (!FlowCreatorUtil.canModifyFlow(original, updated, version)) {
+ if (!FlowCreatorUtil.canModifyFlow(original, updated, getVersion())) {
// We would need to remove original and add updated.
//remove flow
RemoveFlowInputBuilder removeflow = new RemoveFlowInputBuilder(original);
java.util.Optional<List<FlowModInputBuilder>> ofFlowRemoveInput =
- ConvertorManager.getInstance().convert(removeflow.build(), data);
+ convertorExecutor.convert(removeflow.build(), data);
if (ofFlowRemoveInput.isPresent()) {
// remove flow should be the first
}
AddFlowInputBuilder addFlowInputBuilder = new AddFlowInputBuilder(updated);
- ofFlowModInputs = ConvertorManager.getInstance().convert(addFlowInputBuilder.build(), data);
+ ofFlowModInputs = convertorExecutor.convert(addFlowInputBuilder.build(), data);
} else {
- ofFlowModInputs = ConvertorManager.getInstance().convert(updated, data);
+ ofFlowModInputs = convertorExecutor.convert(updated, data);
}
//deleting flow hash value from operational DS
return getInput().getUpdatedFlow().isBarrier();
}
}
- return new OFRpcTaskImpl(taskContext, cookie, input, rwTx);
+ return new OFRpcTaskImpl(taskContext, cookie, input, rwTx, convertorExecutor);
}
* @param taskContext taks context
* @param input group update input
* @param cookie switch connection distinguisher cookie value
+ * @param convertorExecutor
* @return update group task
*/
public static OFRpcTask<AddGroupInput, RpcResult<UpdateGroupOutput>> createAddGroupTask(
final OFRpcTaskContext taskContext, AddGroupInput input,
- final SwitchConnectionDistinguisher cookie) {
+ final SwitchConnectionDistinguisher cookie, ConvertorExecutor convertorExecutor) {
class OFRpcTaskImpl extends OFRpcTask<AddGroupInput, RpcResult<UpdateGroupOutput>> {
- public OFRpcTaskImpl(OFRpcTaskContext taskContext, SwitchConnectionDistinguisher cookie, AddGroupInput input) {
+ private final ConvertorExecutor convertorExecutor;
+ private final VersionDatapathIdConvertorData data;
+
+ public OFRpcTaskImpl(OFRpcTaskContext taskContext, SwitchConnectionDistinguisher cookie, AddGroupInput input, ConvertorExecutor convertorExecutor) {
super(taskContext, cookie, input);
+ this.convertorExecutor = convertorExecutor;
+ data = new VersionDatapathIdConvertorData(getVersion());
+ data.setDatapathId(getSession().getFeatures().getDatapathId());
}
@Override
public ListenableFuture<RpcResult<UpdateGroupOutput>> call() {
ListenableFuture<RpcResult<UpdateGroupOutput>> result = SettableFuture.create();
- final VersionDatapathIdConvertorData data = new VersionDatapathIdConvertorData(getVersion());
- data.setDatapathId(getSession().getFeatures().getDatapathId());
// Convert the AddGroupInput to GroupModInput
- final java.util.Optional<GroupModInputBuilder> ofGroupModInput = ConvertorManager.getInstance().convert(getInput(), data);
+ final java.util.Optional<GroupModInputBuilder> ofGroupModInput = convertorExecutor.convert(getInput(), data);
final GroupModInputBuilder groupModInputBuilder = ofGroupModInput
.orElse(GroupConvertor.defaultResult(getVersion()))
.setXid(getSession().getNextXid());
}
};
- return new OFRpcTaskImpl(taskContext, cookie, input);
+ return new OFRpcTaskImpl(taskContext, cookie, input, convertorExecutor);
}
* @param taskContext task context
* @param input meter add input
* @param cookie switch connection distinguisher
+ * @param convertorExecutor
* @return update meter task
*/
public static OFRpcTask<AddMeterInput, RpcResult<UpdateMeterOutput>> createAddMeterTask(
OFRpcTaskContext taskContext, AddMeterInput input,
- SwitchConnectionDistinguisher cookie) {
+ SwitchConnectionDistinguisher cookie, ConvertorExecutor convertorExecutor) {
class OFRpcTaskImpl extends OFRpcTask<AddMeterInput, RpcResult<UpdateMeterOutput>> {
- public OFRpcTaskImpl(OFRpcTaskContext taskContext, SwitchConnectionDistinguisher cookie, AddMeterInput input) {
+ private final ConvertorExecutor convertorExecutor;
+ private final VersionConvertorData data;
+
+ public OFRpcTaskImpl(OFRpcTaskContext taskContext, SwitchConnectionDistinguisher cookie, AddMeterInput input, ConvertorExecutor convertorExecutor) {
super(taskContext, cookie, input);
+ this.convertorExecutor = convertorExecutor;
+ data = new VersionConvertorData(getVersion());
}
@Override
ListenableFuture<RpcResult<UpdateMeterOutput>> result = SettableFuture.create();
// Convert the AddMeterInput to UpdateMeterOutput
- final java.util.Optional<MeterModInputBuilder> ofMeterModInput = ConvertorManager
- .getInstance()
- .convert(getInput(), new VersionConvertorData(getVersion()));
+ final java.util.Optional<MeterModInputBuilder> ofMeterModInput = convertorExecutor.convert(getInput(), data);
final MeterModInputBuilder meterModInputBuilder = ofMeterModInput
.orElse(MeterConvertor.defaultResult(getVersion()))
}
};
- return new OFRpcTaskImpl(taskContext, cookie, input);
+ return new OFRpcTaskImpl(taskContext, cookie, input, convertorExecutor);
}
/**
* @param taskContext task context
* @param input update group output
* @param cookie switch connection distinguisher cookie value
+ * @param convertorExecutor
* @return UpdateFlow task
*/
public static OFRpcTask<UpdateGroupInput, RpcResult<UpdateGroupOutput>> createUpdateGroupTask(
OFRpcTaskContext taskContext, UpdateGroupInput input,
- SwitchConnectionDistinguisher cookie) {
+ SwitchConnectionDistinguisher cookie, ConvertorExecutor convertorExecutor) {
class OFRpcTaskImpl extends OFRpcTask<UpdateGroupInput, RpcResult<UpdateGroupOutput>> {
+ private final ConvertorExecutor convertorExecutor;
+ private final VersionDatapathIdConvertorData data;
+
public OFRpcTaskImpl(OFRpcTaskContext taskContext, SwitchConnectionDistinguisher cookie,
- UpdateGroupInput input) {
+ UpdateGroupInput input, ConvertorExecutor convertorExecutor) {
super(taskContext, cookie, input);
+ this.convertorExecutor = convertorExecutor;
+ data = new VersionDatapathIdConvertorData(getVersion());
+ data.setDatapathId(getSession().getFeatures().getDatapathId());
}
@Override
public ListenableFuture<RpcResult<UpdateGroupOutput>> call() {
ListenableFuture<RpcResult<UpdateGroupOutput>> result = null;
- final VersionDatapathIdConvertorData data = new VersionDatapathIdConvertorData(getVersion());
- data.setDatapathId(getSession().getFeatures().getDatapathId());
// Convert the UpdateGroupInput to GroupModInput
final java.util.Optional<GroupModInputBuilder> ofGroupModInput =
- ConvertorManager.getInstance().convert(getInput().getUpdatedGroup(), data);
+ convertorExecutor.convert(getInput().getUpdatedGroup(), data);
final GroupModInputBuilder groupModInputBuilder = ofGroupModInput
.orElse(GroupConvertor.defaultResult(getVersion()))
}
}
- return new OFRpcTaskImpl(taskContext, cookie, input);
+ return new OFRpcTaskImpl(taskContext, cookie, input, convertorExecutor);
}
/**
* @param taskContext task context
* @param input update meter input
* @param cookie switch connection distinguisher cookie value
+ * @param convertorExecutor
* @return update meter task
*/
public static OFRpcTask<UpdateMeterInput, RpcResult<UpdateMeterOutput>> createUpdateMeterTask(
OFRpcTaskContext taskContext, UpdateMeterInput input,
- SwitchConnectionDistinguisher cookie) {
+ SwitchConnectionDistinguisher cookie, ConvertorExecutor convertorExecutor) {
class OFRpcTaskImpl extends OFRpcTask<UpdateMeterInput, RpcResult<UpdateMeterOutput>> {
+ private final ConvertorExecutor convertorExecutor;
+ private final VersionConvertorData data;
+
public OFRpcTaskImpl(OFRpcTaskContext taskContext, SwitchConnectionDistinguisher cookie,
- UpdateMeterInput input) {
+ UpdateMeterInput input, ConvertorExecutor convertorExecutor) {
super(taskContext, cookie, input);
+ this.convertorExecutor = convertorExecutor;
+ data = new VersionConvertorData(getVersion());
}
@Override
ListenableFuture<RpcResult<UpdateMeterOutput>> result = null;
// Convert the UpdateMeterInput to MeterModInput
- final java.util.Optional<MeterModInputBuilder> ofMeterModInput = ConvertorManager
- .getInstance()
- .convert(getInput().getUpdatedMeter(), new VersionConvertorData(getVersion()));
+ final java.util.Optional<MeterModInputBuilder> ofMeterModInput = convertorExecutor.convert(getInput().getUpdatedMeter(), data);
final MeterModInputBuilder meterModInputBuilder = ofMeterModInput
.orElse(MeterConvertor.defaultResult(getVersion()))
}
}
- return new OFRpcTaskImpl(taskContext, cookie, input);
+ return new OFRpcTaskImpl(taskContext, cookie, input, convertorExecutor);
}
/**
* @param taskContext task context
* @param input update flow input
* @param cookie switch connection distinguisher cookie value
+ * @param convertorExecutor
* @return task remove flow task
*/
public static OFRpcTask<RemoveFlowInput, RpcResult<UpdateFlowOutput>> createRemoveFlowTask(
OFRpcTaskContext taskContext, RemoveFlowInput input,
- SwitchConnectionDistinguisher cookie) {
+ SwitchConnectionDistinguisher cookie, ConvertorExecutor convertorExecutor) {
class OFRpcTaskImpl extends OFRpcTask<RemoveFlowInput, RpcResult<UpdateFlowOutput>> {
+ private final VersionDatapathIdConvertorData data;
+ private final ConvertorExecutor convertorExecutor;
+
public OFRpcTaskImpl(OFRpcTaskContext taskContext, SwitchConnectionDistinguisher cookie,
- RemoveFlowInput input) {
+ RemoveFlowInput input, ConvertorExecutor convertorExecutor) {
super(taskContext, cookie, input);
+ this.convertorExecutor = convertorExecutor;
+ data = new VersionDatapathIdConvertorData(getVersion());
+ data.setDatapathId(getSession().getFeatures().getDatapathId());
}
@Override
public ListenableFuture<RpcResult<UpdateFlowOutput>> call() {
ListenableFuture<RpcResult<UpdateFlowOutput>> result = SettableFuture.create();
- final VersionDatapathIdConvertorData data = new VersionDatapathIdConvertorData(getVersion());
- data.setDatapathId(getSession().getFeatures().getDatapathId());
// Convert the AddFlowInput to FlowModInput
- final java.util.Optional<List<FlowModInputBuilder>> ofFlowModInputs =
- ConvertorManager.getInstance().convert(getInput(), data);
+ final java.util.Optional<List<FlowModInputBuilder>> ofFlowModInputs = convertorExecutor.convert(getInput(), data);
result = chainFlowMods(ofFlowModInputs.orElse(Collections.emptyList()), 0, getTaskContext(), getCookie());
result = OFRpcTaskUtil.chainFutureBarrier(this, result);
}
}
- return new OFRpcTaskImpl(taskContext, cookie, input);
+ return new OFRpcTaskImpl(taskContext, cookie, input, convertorExecutor);
}
/**
* @param taskContext task context
* @param input remove group input
* @param cookie switch connection distinguisher cookie value
+ * @param convertorExecutor
* @return task remove group task
*/
public static OFRpcTask<RemoveGroupInput, RpcResult<UpdateGroupOutput>> createRemoveGroupTask(
final OFRpcTaskContext taskContext, RemoveGroupInput input,
- final SwitchConnectionDistinguisher cookie) {
+ final SwitchConnectionDistinguisher cookie, ConvertorExecutor convertorExecutor) {
class OFRpcTaskImpl extends OFRpcTask<RemoveGroupInput, RpcResult<UpdateGroupOutput>> {
+ private final ConvertorExecutor convertorExecutor;
+ private final VersionDatapathIdConvertorData data;
+
public OFRpcTaskImpl(OFRpcTaskContext taskContext, SwitchConnectionDistinguisher cookie,
- RemoveGroupInput input) {
+ RemoveGroupInput input, ConvertorExecutor convertorExecutor) {
super(taskContext, cookie, input);
+ this.convertorExecutor = convertorExecutor;
+ data = new VersionDatapathIdConvertorData(getVersion());
+ data.setDatapathId(getSession().getFeatures().getDatapathId());
}
@Override
public ListenableFuture<RpcResult<UpdateGroupOutput>> call() {
ListenableFuture<RpcResult<UpdateGroupOutput>> result = SettableFuture.create();
- final VersionDatapathIdConvertorData data = new VersionDatapathIdConvertorData(getVersion());
- data.setDatapathId(getSession().getFeatures().getDatapathId());
// Convert the AddGroupInput to GroupModInput
- final java.util.Optional<GroupModInputBuilder> ofGroupModInput =
- ConvertorManager.getInstance().convert(getInput(), data);
+ final java.util.Optional<GroupModInputBuilder> ofGroupModInput = convertorExecutor.convert(getInput(), data);
final GroupModInputBuilder groupModInputBuilder = ofGroupModInput
.orElse(GroupConvertor.defaultResult(getVersion()))
}
}
- return new OFRpcTaskImpl(taskContext, cookie, input);
+ return new OFRpcTaskImpl(taskContext, cookie, input, convertorExecutor);
}
/**
* @param taskContext task context
* @param input meter removed input
* @param cookie switch connection distinguisher cookie value
+ * @param convertorExecutor
* @return task meter remove task
*/
public static OFRpcTask<RemoveMeterInput, RpcResult<UpdateMeterOutput>> createRemoveMeterTask(
OFRpcTaskContext taskContext, RemoveMeterInput input,
- SwitchConnectionDistinguisher cookie) {
+ SwitchConnectionDistinguisher cookie, ConvertorExecutor convertorExecutor) {
class OFRpcTaskImpl extends OFRpcTask<RemoveMeterInput, RpcResult<UpdateMeterOutput>> {
+ private final ConvertorExecutor convertorExecutor;
+ private final VersionConvertorData data;
+
public OFRpcTaskImpl(OFRpcTaskContext taskContext, SwitchConnectionDistinguisher cookie,
- RemoveMeterInput input) {
+ RemoveMeterInput input, ConvertorExecutor convertorExecutor) {
super(taskContext, cookie, input);
+ this.convertorExecutor = convertorExecutor;
+ data = new VersionConvertorData(getVersion());
}
@Override
ListenableFuture<RpcResult<UpdateMeterOutput>> result = SettableFuture.create();
// Convert the RemoveMeterInput to UpdateMeterOutput
- final java.util.Optional<MeterModInputBuilder> ofMeterModInput = ConvertorManager
- .getInstance()
- .convert(getInput(), new VersionConvertorData(getVersion()));
+ final java.util.Optional<MeterModInputBuilder> ofMeterModInput = convertorExecutor.convert(getInput(), data);
final MeterModInputBuilder meterModInputBuilder = ofMeterModInput
.orElse(MeterConvertor.defaultResult(getVersion()))
}
}
- return new OFRpcTaskImpl(taskContext, cookie, input);
+ return new OFRpcTaskImpl(taskContext, cookie, input, convertorExecutor);
}
* @param taskContext task context
* @param input get flow statistics from flow table
* @param cookie switch connection distinguisher cookie value
+ * @param convertorExecutor
* @return task get flow statistics from flow table task
*/
public static OFRpcTask<GetFlowStatisticsFromFlowTableInput, RpcResult<GetFlowStatisticsFromFlowTableOutput>>
createGetFlowStatisticsFromFlowTableTask(
final OFRpcTaskContext taskContext,
- final GetFlowStatisticsFromFlowTableInput input, SwitchConnectionDistinguisher cookie) {
+ final GetFlowStatisticsFromFlowTableInput input, SwitchConnectionDistinguisher cookie, ConvertorExecutor convertorExecutor) {
class OFRpcTaskImpl extends OFRpcTask<GetFlowStatisticsFromFlowTableInput, RpcResult<GetFlowStatisticsFromFlowTableOutput>> {
+ private final ConvertorExecutor convertorExecutor;
+
public OFRpcTaskImpl(OFRpcTaskContext taskContext, SwitchConnectionDistinguisher cookie,
- GetFlowStatisticsFromFlowTableInput input) {
+ GetFlowStatisticsFromFlowTableInput input, ConvertorExecutor convertorExecutor) {
super(taskContext, cookie, input);
+ this.convertorExecutor = convertorExecutor;
}
@Override
// convert and inject match
MatchReactor.getInstance().convert(input.getMatch(), taskContext.getSession()
- .getPrimaryConductor().getVersion(), mprFlowRequestBuilder);
+ .getPrimaryConductor().getVersion(), mprFlowRequestBuilder, convertorExecutor);
// Set request body to main multipart request
multipartRequestFlowCaseBuilder.setMultipartRequestFlow(mprFlowRequestBuilder.build());
}
}
- return new OFRpcTaskImpl(taskContext, cookie, input);
+ return new OFRpcTaskImpl(taskContext, cookie, input, convertorExecutor);
}
/**
* @param taskContext task context
* @param input aggregate flow statistics input
* @param cookie switch connection distinguisher cookie value
+ * @param convertorExecutor
* @return task task to fetch the statistics
*/
public static OFRpcTask<GetAggregateFlowStatisticsFromFlowTableForGivenMatchInput, RpcResult<GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutput>>
createGetAggregateFlowStatisticsFromFlowTableForGivenMatchTask(
final OFRpcTaskContext taskContext,
- final GetAggregateFlowStatisticsFromFlowTableForGivenMatchInput input, SwitchConnectionDistinguisher cookie) {
+ final GetAggregateFlowStatisticsFromFlowTableForGivenMatchInput input, SwitchConnectionDistinguisher cookie, ConvertorExecutor convertorExecutor) {
class OFRpcTaskImpl extends OFRpcTask<GetAggregateFlowStatisticsFromFlowTableForGivenMatchInput, RpcResult<GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutput>> {
+ private final ConvertorExecutor convertorExecutor;
+
public OFRpcTaskImpl(OFRpcTaskContext taskContext, SwitchConnectionDistinguisher cookie,
- GetAggregateFlowStatisticsFromFlowTableForGivenMatchInput input) {
+ GetAggregateFlowStatisticsFromFlowTableForGivenMatchInput input, ConvertorExecutor convertorExecutor) {
super(taskContext, cookie, input);
+ this.convertorExecutor = convertorExecutor;
}
@Override
}
MatchReactor.getInstance().convert(input.getMatch(), taskContext.getSession()
- .getPrimaryConductor().getVersion(), mprAggregateRequestBuilder);
+ .getPrimaryConductor().getVersion(), mprAggregateRequestBuilder, convertorExecutor);
FlowCreatorUtil.setWildcardedFlowMatch(taskContext.getSession()
.getPrimaryConductor().getVersion(), mprAggregateRequestBuilder);
}
}
- return new OFRpcTaskImpl(taskContext, cookie, input);
+ return new OFRpcTaskImpl(taskContext, cookie, input, convertorExecutor);
}
/**
* @param taskContext task context
* @param input update port input
* @param cookie switch connection distinguisher cookie value
+ * @param convertorExecutor
* @return task task to update port
*/
public static OFRpcTask<UpdatePortInput, RpcResult<UpdatePortOutput>> createUpdatePortTask(
final OFRpcTaskContext taskContext, final UpdatePortInput input,
- final SwitchConnectionDistinguisher cookie) {
+ final SwitchConnectionDistinguisher cookie, ConvertorExecutor convertorExecutor) {
class OFRpcTaskImpl extends OFRpcTask<UpdatePortInput, RpcResult<UpdatePortOutput>> {
+ private final ConvertorExecutor convertorExecutor;
+ private final VersionConvertorData data;
+
public OFRpcTaskImpl(OFRpcTaskContext taskContext, SwitchConnectionDistinguisher cookie,
- UpdatePortInput input) {
+ UpdatePortInput input, ConvertorExecutor convertorExecutor) {
super(taskContext, cookie, input);
+ this.convertorExecutor = convertorExecutor;
+ data = new VersionConvertorData(getVersion());
}
@Override
public ListenableFuture<RpcResult<UpdatePortOutput>> call() {
ListenableFuture<RpcResult<UpdatePortOutput>> result = SettableFuture.create();
- final short version = taskContext.getSession().getPrimaryConductor().getVersion();
final Port inputPort = input.getUpdatedPort().getPort().getPort().get(0);
- final java.util.Optional<PortModInput> ofPortModInput = ConvertorManager
- .getInstance()
- .convert(inputPort, new VersionConvertorData(version));
+ final java.util.Optional<PortModInput> ofPortModInput = convertorExecutor.convert(inputPort, data);
PortModInputBuilder mdInput = new PortModInputBuilder(ofPortModInput
- .orElse(PortConvertor.defaultResult(version)))
+ .orElse(PortConvertor.defaultResult(getVersion())))
.setXid(taskContext.getSession().getNextXid());
Future<RpcResult<UpdatePortOutput>> resultFromOFLib = getMessageService()
}
}
- return new OFRpcTaskImpl(taskContext, cookie, input);
+ return new OFRpcTaskImpl(taskContext, cookie, input, convertorExecutor);
}
/**
* @param taskContext task context
* @param input update table input
* @param cookie switch connection distinguisher cookie value
+ * @param convertorExecutor
* @return task task to udpate table input
*/
public static OFRpcTask<UpdateTableInput, RpcResult<UpdateTableOutput>> createUpdateTableTask(
final OFRpcTaskContext taskContext, final UpdateTableInput input,
- final SwitchConnectionDistinguisher cookie) {
+ final SwitchConnectionDistinguisher cookie, ConvertorExecutor convertorExecutor) {
class OFRpcTaskImpl extends OFRpcTask<UpdateTableInput, RpcResult<UpdateTableOutput>> {
+ private final ConvertorExecutor convertorExecutor;
+ private final VersionConvertorData data;
+
public OFRpcTaskImpl(OFRpcTaskContext taskContext, SwitchConnectionDistinguisher cookie,
- UpdateTableInput input) {
+ UpdateTableInput input, ConvertorExecutor convertorExecutor) {
super(taskContext, cookie, input);
+ this.convertorExecutor = convertorExecutor;
+ data = new VersionConvertorData(getVersion());
}
@Override
MultipartRequestTableFeaturesCaseBuilder caseBuilder = new MultipartRequestTableFeaturesCaseBuilder();
MultipartRequestTableFeaturesBuilder requestBuilder = new MultipartRequestTableFeaturesBuilder();
- final java.util.Optional<List<TableFeatures>> ofTableFeatureList = ConvertorManager.getInstance().convert(input.getUpdatedTable());
+ final java.util.Optional<List<TableFeatures>> ofTableFeatureList = convertorExecutor.convert(input.getUpdatedTable(), data);
requestBuilder.setTableFeatures(ofTableFeatureList.orElse(Collections.emptyList()));
caseBuilder.setMultipartRequestTableFeatures(requestBuilder.build());
}
}
- return new OFRpcTaskImpl(taskContext, cookie, input);
+ return new OFRpcTaskImpl(taskContext, cookie, input, convertorExecutor);
}
public static OFRpcTask<SetConfigInput, RpcResult<SetConfigOutput>> createSetNodeConfigTask(final OFRpcTaskContext taskContext,
Code Review / openflowplugin.git / blobdiff