X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=servicehandler%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fservicehandler%2Fservice%2FServiceDataStoreOperationsImplTest.java;h=f7446c48d32ce2dee06f5a6f190d3a9430538fa1;hb=ee1ddcf873e73d9952aa5002e242b003c53795bf;hp=83ff2ab76839d3eb5c02103310e60accab3a1efc;hpb=c72df380a231df4cadf26101d530b648ffc6ad85;p=transportpce.git diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java index 83ff2ab76..f7446c48d 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java @@ -12,7 +12,6 @@ import static org.opendaylight.transportpce.servicehandler.service.ServiceDataSt import java.util.Optional; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.transportpce.common.OperationResult; @@ -34,8 +33,8 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdes import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.response.parameters.sp.ResponseParameters; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.response.parameters.sp.ResponseParametersBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.response.parameters.sp.response.parameters.PathDescriptionBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; -@Ignore //writeOrModifyOrDeleteServiceList deprecated method should not raise warnings in tests @SuppressWarnings("deprecation") public class ServiceDataStoreOperationsImplTest extends AbstractTest { @@ -94,7 +93,7 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build(); PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder() .setConfigurationResponseCommon(configurationResponseCommon).build(); - OperationResult createOutput = this.serviceDataStoreOperations.createService(createInput); + this.serviceDataStoreOperations.createService(createInput); String result = serviceDataStoreOperations.writeOrModifyOrDeleteServiceList("service 1", createInput, pathComputationRequestOutput, 0); Assert.assertNull(result); @@ -109,7 +108,7 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build(); PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder() .setConfigurationResponseCommon(configurationResponseCommon).build(); - OperationResult createOutput = this.serviceDataStoreOperations.createService(createInput); + this.serviceDataStoreOperations.createService(createInput); String result = serviceDataStoreOperations.writeOrModifyOrDeleteServiceList("service 1", createInput, pathComputationRequestOutput, 1); Assert.assertNull(result); @@ -123,7 +122,7 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build(); PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder() .setConfigurationResponseCommon(configurationResponseCommon).build(); - OperationResult createOutput = this.serviceDataStoreOperations.createService(createInput); + this.serviceDataStoreOperations.createService(createInput); String result = serviceDataStoreOperations.writeOrModifyOrDeleteServiceList("service 1", createInput, pathComputationRequestOutput, 2); Assert.assertNull(result); @@ -228,8 +227,10 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build(); ResponseParameters responseParameters = new ResponseParametersBuilder() .setPathDescription(new PathDescriptionBuilder() - .setAToZDirection(new AToZDirectionBuilder().setAToZWavelengthNumber(1L).setRate(1L).build()) - .setZToADirection(new ZToADirectionBuilder().setZToAWavelengthNumber(1L).setRate(1L).build()).build()) + .setAToZDirection(new AToZDirectionBuilder() + .setAToZWavelengthNumber(Uint32.valueOf(1)).setRate(Uint32.valueOf(1)).build()) + .setZToADirection(new ZToADirectionBuilder() + .setZToAWavelengthNumber(Uint32.valueOf(1)).setRate(Uint32.valueOf(1)).build()).build()) .build(); PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder() .setConfigurationResponseCommon(configurationResponseCommon).setResponseParameters(responseParameters) @@ -266,8 +267,10 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build(); ResponseParameters responseParameters = new ResponseParametersBuilder() .setPathDescription(new PathDescriptionBuilder() - .setAToZDirection(new AToZDirectionBuilder().setAToZWavelengthNumber(1L).setRate(1L).build()) - .setZToADirection(new ZToADirectionBuilder().setZToAWavelengthNumber(1L).setRate(1L).build()).build()) + .setAToZDirection(new AToZDirectionBuilder() + .setAToZWavelengthNumber(Uint32.valueOf(1)).setRate(Uint32.valueOf(1)).build()) + .setZToADirection(new ZToADirectionBuilder() + .setZToAWavelengthNumber(Uint32.valueOf(1)).setRate(Uint32.valueOf(1)).build()).build()) .build(); PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder() .setConfigurationResponseCommon(configurationResponseCommon).setResponseParameters(responseParameters)