import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ActionType;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.common.RpcError;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
+import org.opendaylight.yangtools.yang.common.ErrorType;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
import org.opendaylight.yangtools.yang.common.Uint32;
/**
public class GroupUtilTest {
private static final NodeId DUMMY_NODE_ID = new NodeId("dummyNodeId");
- private static final GroupId DUMMY_GROUP_ID = new GroupId(42L);
- private static final GroupId DUMMY_GROUP_ID_2 = new GroupId(43L);
+ private static final GroupId DUMMY_GROUP_ID = new GroupId(Uint32.valueOf(42));
+ private static final GroupId DUMMY_GROUP_ID_2 = new GroupId(Uint32.valueOf(43));
private static final long GROUP_ACTION_BITMAP =
0b00000000000000000000000000000000000001111111111111001100000000001L;
final RpcResult<List<BatchFailedGroupsOutput>> summary = function.apply(Lists.newArrayList(
RpcResultBuilder.success("a").build(),
RpcResultBuilder.<String>failed()
- .withError(RpcError.ErrorType.APPLICATION, "action-failed reason")
+ .withError(ErrorType.APPLICATION, "action-failed reason")
.build()));
Assert.assertFalse(summary.isSuccessful());
private static RpcResult<List<BatchFailedGroupsOutput>> createBatchOutcomeWithError() {
return RpcResultBuilder.<List<BatchFailedGroupsOutput>>failed()
- .withError(RpcError.ErrorType.APPLICATION, "ut-flowAddFail")
- .withResult(Collections.singletonList(new BatchFailedGroupsOutputBuilder()
+ .withError(ErrorType.APPLICATION, "ut-flowAddFail")
+ .withResult(List.of(new BatchFailedGroupsOutputBuilder()
+ .setBatchOrder(Uint16.ZERO)
.setGroupId(DUMMY_GROUP_ID)
.build()))
.build();
private static RpcResult<SendBarrierOutput> createBarrierFailureOutcome() {
return RpcResultBuilder.<SendBarrierOutput>failed()
- .withError(RpcError.ErrorType.APPLICATION, "ut-barrier-error")
+ .withError(ErrorType.APPLICATION, "ut-barrier-error")
.build();
}
private static RpcResult<AddGroupsBatchOutput> createAddGroupsBatchSuccessOutput() {
return RpcResultBuilder
.success(new AddGroupsBatchOutputBuilder()
- .setBatchFailedGroupsOutput(Collections.emptyList())
+ .setBatchFailedGroupsOutput(Collections.emptyMap())
.build())
.build();
}
final RpcResult<List<BatchFailedGroupsOutput>> batchOutcomeWithError = createBatchOutcomeWithError();
return RpcResultBuilder.<AddGroupsBatchOutput>failed()
.withResult(new AddGroupsBatchOutputBuilder()
- .setBatchFailedGroupsOutput(batchOutcomeWithError.getResult())
+ .setBatchFailedGroupsOutput(BindingMap.ordered(batchOutcomeWithError.getResult()))
.build())
.withRpcErrors(batchOutcomeWithError.getErrors())
.build();