X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fimpl%2Fservices%2Fsal%2FSalFlowsBatchServiceImplTest.java;h=5825acd5a007d9803b9866cade4a94779ef297da;hb=777c94332871b8c34f56f7f2010de1536cb759ba;hp=09f6c43b3bb7255537a247cc14a790ea2a6a8101;hpb=ed4d25aecaabfe181dbb114d4666f3a05f3531fb;p=openflowplugin.git diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlowsBatchServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlowsBatchServiceImplTest.java index 09f6c43b3b..5825acd5a0 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlowsBatchServiceImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlowsBatchServiceImplTest.java @@ -62,7 +62,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.N import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.util.BindingMap; -import org.opendaylight.yangtools.yang.common.RpcError; +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; @@ -151,7 +151,7 @@ public class SalFlowsBatchServiceImplTest { public void testRemoveFlowsBatch_failed() throws Exception { Mockito.when(salFlowService.removeFlow(ArgumentMatchers.any())) .thenReturn(RpcResultBuilder.failed() - .withError(RpcError.ErrorType.APPLICATION, "flow-remove-fail-1") + .withError(ErrorType.APPLICATION, "flow-remove-fail-1") .buildFuture()); final BatchRemoveFlows batchFlow1 = createEmptyBatchRemoveFlow(FLOW_ID_VALUE_1, 42); @@ -246,7 +246,7 @@ public class SalFlowsBatchServiceImplTest { public void testAddFlowsBatch_failed() throws Exception { Mockito.when(salFlowService.addFlow(ArgumentMatchers.any())) .thenReturn(RpcResultBuilder - .failed().withError(RpcError.ErrorType.APPLICATION, "ut-groupAddError") + .failed().withError(ErrorType.APPLICATION, "ut-groupAddError") .buildFuture()); final AddFlowsBatchInput input = new AddFlowsBatchInputBuilder() @@ -314,7 +314,7 @@ public class SalFlowsBatchServiceImplTest { public void testUpdateFlowsBatch_failure() throws Exception { Mockito.when(salFlowService.updateFlow(ArgumentMatchers.any())) .thenReturn(RpcResultBuilder.failed() - .withError(RpcError.ErrorType.APPLICATION, "ut-flowUpdateError") + .withError(ErrorType.APPLICATION, "ut-flowUpdateError") .buildFuture()); final UpdateFlowsBatchInput input = new UpdateFlowsBatchInputBuilder()