import static org.opendaylight.openflowplugin.applications.frm.util.FrmUtil.buildGroupInstanceIdentifier;
import static org.opendaylight.openflowplugin.applications.frm.util.FrmUtil.getActiveBundle;
import static org.opendaylight.openflowplugin.applications.frm.util.FrmUtil.getFlowId;
-import static org.opendaylight.openflowplugin.applications.frm.util.FrmUtil.getNodeIdFromNodeIdentifier;
+import static org.opendaylight.openflowplugin.applications.frm.util.FrmUtil.getNodeIdValueFromNodeIdentifier;
import static org.opendaylight.openflowplugin.applications.frm.util.FrmUtil.isFlowDependentOnGroup;
import static org.opendaylight.openflowplugin.applications.frm.util.FrmUtil.isGroupExistsOnDevice;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.AddGroupOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupRef;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
if (bundleId != null) {
provider.getBundleFlowListener().remove(identifier, removeDataObj, nodeIdent, bundleId);
} else {
- final NodeId nodeId = getNodeIdFromNodeIdentifier(nodeIdent);
- nodeConfigurator.enqueueJob(nodeId.getValue(), () -> {
+ final String nodeId = getNodeIdValueFromNodeIdentifier(nodeIdent);
+ nodeConfigurator.enqueueJob(nodeId, () -> {
final RemoveFlowInputBuilder builder = new RemoveFlowInputBuilder(removeDataObj);
builder.setFlowRef(new FlowRef(identifier));
builder.setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class)));
if (bundleId != null) {
provider.getBundleFlowListener().update(identifier, original, update, nodeIdent, bundleId);
} else {
- final NodeId nodeId = getNodeIdFromNodeIdentifier(nodeIdent);
- nodeConfigurator.enqueueJob(nodeId.getValue(), () -> {
+ final String nodeId = getNodeIdValueFromNodeIdentifier(nodeIdent);
+ nodeConfigurator.enqueueJob(nodeId, () -> {
final UpdateFlowInputBuilder builder = new UpdateFlowInputBuilder();
builder.setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class)));
builder.setFlowRef(new FlowRef(identifier));
Uint32 groupId = isFlowDependentOnGroup(update);
if (groupId != null) {
LOG.trace("The flow {} is dependent on group {}. Checking if the group is already present",
- getFlowId(new FlowRef(identifier)), groupId);
+ getFlowId(identifier), groupId);
if (isGroupExistsOnDevice(nodeIdent, groupId, provider)) {
LOG.trace("The dependent group {} is already programmed. Updating the flow {}", groupId,
- getFlowId(new FlowRef(identifier)));
+ getFlowId(identifier));
return provider.getSalFlowService().updateFlow(builder.build());
} else {
LOG.trace("The dependent group {} isn't programmed yet. Pushing the group", groupId);
}
LOG.trace("The flow {} is not dependent on any group. Updating the flow",
- getFlowId(new FlowRef(identifier)));
+ getFlowId(identifier));
return provider.getSalFlowService().updateFlow(builder.build());
});
}
if (bundleId != null) {
return provider.getBundleFlowListener().add(identifier, addDataObj, nodeIdent, bundleId);
} else {
- final NodeId nodeId = getNodeIdFromNodeIdentifier(nodeIdent);
- nodeConfigurator.enqueueJob(nodeId.getValue(), () -> {
+ final String nodeId = getNodeIdValueFromNodeIdentifier(nodeIdent);
+ nodeConfigurator.enqueueJob(nodeId, () -> {
final AddFlowInputBuilder builder = new AddFlowInputBuilder(addDataObj);
builder.setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class)));
@Override
public void createStaleMarkEntity(InstanceIdentifier<Flow> identifier, Flow del,
InstanceIdentifier<FlowCapableNode> nodeIdent) {
- LOG.debug("Creating Stale-Mark entry for the switch {} for flow {} ", nodeIdent.toString(), del.toString());
+ LOG.debug("Creating Stale-Mark entry for the switch {} for flow {} ", nodeIdent, del);
StaleFlow staleFlow = makeStaleFlow(identifier, del, nodeIdent);
persistStaleFlow(staleFlow, nodeIdent);
}
return true;
}
- private StaleFlow makeStaleFlow(InstanceIdentifier<Flow> identifier, Flow del,
+ private static StaleFlow makeStaleFlow(InstanceIdentifier<Flow> identifier, Flow del,
InstanceIdentifier<FlowCapableNode> nodeIdent) {
StaleFlowBuilder staleFlowBuilder = new StaleFlowBuilder(del);
return staleFlowBuilder.setId(del.getId()).build();
private void persistStaleFlow(StaleFlow staleFlow, InstanceIdentifier<FlowCapableNode> nodeIdent) {
WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction();
writeTransaction.put(LogicalDatastoreType.CONFIGURATION, getStaleFlowInstanceIdentifier(staleFlow, nodeIdent),
- staleFlow, false);
+ staleFlow);
FluentFuture<?> submitFuture = writeTransaction.commit();
handleStaleFlowResultFuture(submitFuture);
}
- private void handleStaleFlowResultFuture(FluentFuture<?> submitFuture) {
+ private static void handleStaleFlowResultFuture(FluentFuture<?> submitFuture) {
submitFuture.addCallback(new FutureCallback<Object>() {
@Override
public void onSuccess(Object result) {
}
- private InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight
+ private static InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight
.flow.inventory.rev130819.tables.table.StaleFlow> getStaleFlowInstanceIdentifier(
StaleFlow staleFlow, InstanceIdentifier<FlowCapableNode> nodeIdent) {
return nodeIdent.child(Table.class, new TableKey(staleFlow.getTableId())).child(
private final class AddFlowCallBack implements FutureCallback<RpcResult<AddGroupOutput>> {
private final AddFlowInput addFlowInput;
- private final NodeId nodeId;
+ private final String nodeId;
private final Uint32 groupId;
private final SettableFuture<RpcResult<AddFlowOutput>> resultFuture;
- private AddFlowCallBack(final AddFlowInput addFlowInput, final NodeId nodeId, Uint32 groupId,
+ private AddFlowCallBack(final AddFlowInput addFlowInput, final String nodeId, Uint32 groupId,
SettableFuture<RpcResult<AddFlowOutput>> resultFuture) {
this.addFlowInput = addFlowInput;
this.nodeId = nodeId;
getFlowId(addFlowInput.getFlowRef()), nodeId);
} else {
LOG.error("Flow add with id {} failed for node {} with error {}", getFlowId(addFlowInput.getFlowRef()),
- nodeId, rpcResult.getErrors().toString());
+ nodeId, rpcResult.getErrors());
resultFuture.set(RpcResultBuilder.<AddFlowOutput>failed()
.withRpcErrors(rpcResult.getErrors()).build());
}
private final class UpdateFlowCallBack implements FutureCallback<RpcResult<AddGroupOutput>> {
private final UpdateFlowInput updateFlowInput;
- private final NodeId nodeId;
+ private final String nodeId;
private final Uint32 groupId;
private final SettableFuture<RpcResult<UpdateFlowOutput>> resultFuture;
- private UpdateFlowCallBack(final UpdateFlowInput updateFlowInput, final NodeId nodeId,
+ private UpdateFlowCallBack(final UpdateFlowInput updateFlowInput, final String nodeId,
SettableFuture<RpcResult<UpdateFlowOutput>> resultFuture, Uint32 groupId) {
this.updateFlowInput = updateFlowInput;
this.nodeId = nodeId;
getFlowId(updateFlowInput.getFlowRef()), nodeId);
} else {
LOG.error("Flow update with id {} failed for node {} with error {}",
- getFlowId(updateFlowInput.getFlowRef()), nodeId, rpcResult.getErrors().toString());
+ getFlowId(updateFlowInput.getFlowRef()), nodeId, rpcResult.getErrors());
resultFuture.set(RpcResultBuilder.<UpdateFlowOutput>failed()
.withRpcErrors(rpcResult.getErrors()).build());
}