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=cca4bc4a86073a5e2ccb80a799b32def73e77f39;hb=ff9991f6b14ebf5e40062f3082aec2bf8b95e67a;hp=67a51b5088083b7f60fe0f63e3df49df49160e25;hpb=c9aef6567c2a11918b591302dc8835a1fa232d40;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 67a51b508..cca4bc4a8 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 @@ -7,37 +7,40 @@ */ package org.opendaylight.transportpce.servicehandler.service; +import static org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperationsImpl.LogMessages; + +import java.util.Optional; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.transportpce.common.OperationResult; import org.opendaylight.transportpce.common.ResponseCodes; import org.opendaylight.transportpce.servicehandler.ServiceInput; import org.opendaylight.transportpce.servicehandler.utils.ServiceDataUtils; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev171017.PathComputationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev171017.PathComputationRequestOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.configuration.response.common.ConfigurationResponseCommon; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.configuration.response.common.ConfigurationResponseCommonBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.State; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceCreateInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.TempServiceCreateInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.list.Services; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.AToZDirectionBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.ZToADirectionBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev171016.response.parameters.sp.ResponseParameters; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev171016.response.parameters.sp.ResponseParametersBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev171016.response.parameters.sp.response.parameters.PathDescriptionBuilder; - -import java.util.Optional; - - +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.configuration.response.common.ConfigurationResponseCommon; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.configuration.response.common.ConfigurationResponseCommonBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; +import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceCreateInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.TempServiceCreateInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.Services; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.path.description.AToZDirectionBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.path.description.ZToADirectionBuilder; +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; + +//writeOrModifyOrDeleteServiceList deprecated method should not raise warnings in tests +@SuppressWarnings("deprecation") public class ServiceDataStoreOperationsImplTest extends AbstractTest { private ServiceDataStoreOperationsImpl serviceDataStoreOperations; - @Before public void init() { DataBroker dataBroker = this.getNewDataBroker(); @@ -47,9 +50,9 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { @Test public void modifyIfServiceNotPresent() { OperationResult result = - this.serviceDataStoreOperations.modifyService("service 1", State.InService, State.InService); + this.serviceDataStoreOperations.modifyService("service 1", State.InService, AdminStates.InService); Assert.assertFalse(result.isSuccess()); - Assert.assertEquals("Service " + "service 1" + " is not present!", result.getResultMessage()); + Assert.assertEquals(LogMessages.SERVICE_NOT_FOUND, result.getResultMessage()); } @Test @@ -64,7 +67,7 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { String result = serviceDataStoreOperations.writeOrModifyOrDeleteServiceList("serviceCreateInput", createInput, pathComputationRequestOutput, 3); - Assert.assertEquals("Service is not present ! ", result); + Assert.assertEquals(LogMessages.SERVICE_NOT_FOUND, result); } @Test @@ -90,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); @@ -99,12 +102,13 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { @Test public void writeOrModifyOrDeleteServiceListPresentWithDeleteChoice() { ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput(); + ConfigurationResponseCommon configurationResponseCommon = new ConfigurationResponseCommonBuilder() .setRequestId("request 1").setAckFinalIndicator(ResponseCodes.FINAL_ACK_NO) .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); @@ -118,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); @@ -127,8 +131,8 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { @Test public void getServiceFromEmptyDataStoreShouldBeEmpty() { - Optional oService = this.serviceDataStoreOperations.getService("service 1"); - Assert.assertFalse(oService.isPresent()); + Optional optService = this.serviceDataStoreOperations.getService("service 1"); + Assert.assertFalse(optService.isPresent()); } @Test @@ -143,9 +147,9 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput(); this.serviceDataStoreOperations.createService(createInput); - Optional oService = this.serviceDataStoreOperations.getService(createInput.getServiceName()); - Assert.assertTrue(oService.isPresent()); - Assert.assertEquals(createInput.getServiceName(), oService.get().getServiceName()); + Optional optService = this.serviceDataStoreOperations.getService(createInput.getServiceName()); + Assert.assertTrue(optService.isPresent()); + Assert.assertEquals(createInput.getServiceName(), optService.get().getServiceName()); } @Test @@ -166,16 +170,16 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { public void modifyServiceIsSuccessfulForPresentService() { ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput(); this.serviceDataStoreOperations.createService(createInput); - OperationResult result = - this.serviceDataStoreOperations.modifyService(createInput.getServiceName(), State.InService, State.InService); + OperationResult result = this.serviceDataStoreOperations.modifyService(createInput.getServiceName(), + State.InService, AdminStates.InService); Assert.assertTrue(result.isSuccess()); } @Test public void getTempServiceFromEmptyDataStoreShouldBeEmpty() { - Optional oService = this.serviceDataStoreOperations.getTempService("service 1"); - Assert.assertFalse(oService.isPresent()); + Optional optService = this.serviceDataStoreOperations.getTempService("service 1"); + Assert.assertFalse(optService.isPresent()); } @Test @@ -190,10 +194,10 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { TempServiceCreateInput createInput = ServiceDataUtils.buildTempServiceCreateInput(); this.serviceDataStoreOperations.createTempService(createInput); - Optional oService = this.serviceDataStoreOperations.getTempService(createInput.getCommonId()); - Assert.assertTrue(oService.isPresent()); - Assert.assertEquals(createInput.getCommonId(), oService.get().getCommonId()); + Optional optService = this.serviceDataStoreOperations.getTempService(createInput.getCommonId()); + Assert.assertTrue(optService.isPresent()); + Assert.assertEquals(createInput.getCommonId(), optService.get().getCommonId()); } @Test @@ -208,8 +212,8 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { public void modifyTempServiceIsSuccessfulForPresentTempService() { TempServiceCreateInput createInput = ServiceDataUtils.buildTempServiceCreateInput(); this.serviceDataStoreOperations.createTempService(createInput); - OperationResult result = - this.serviceDataStoreOperations.modifyTempService(createInput.getCommonId(), State.InService, State.InService); + OperationResult result = this.serviceDataStoreOperations.modifyTempService( + createInput.getCommonId(), State.InService, AdminStates.InService); Assert.assertTrue(result.isSuccess()); } @@ -222,13 +226,17 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { .setRequestId("request 1").setAckFinalIndicator(ResponseCodes.FINAL_ACK_NO) .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()).build(); + .setPathDescription(new PathDescriptionBuilder() + .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).build(); + .setConfigurationResponseCommon(configurationResponseCommon).setResponseParameters(responseParameters) + .build(); OperationResult result = - this.serviceDataStoreOperations.createServicePath(serviceInput, pathComputationRequestOutput); + this.serviceDataStoreOperations.createServicePath(serviceInput, pathComputationRequestOutput); Assert.assertTrue(result.isSuccess()); } @@ -238,13 +246,14 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { this.serviceDataStoreOperations.createService(createInput); ServiceInput serviceInput = new ServiceInput(createInput); ConfigurationResponseCommon configurationResponseCommon = new ConfigurationResponseCommonBuilder() - .setRequestId("request 1").setAckFinalIndicator(ResponseCodes.FINAL_ACK_NO) - .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build(); + .setRequestId("request 1").setAckFinalIndicator(ResponseCodes.FINAL_ACK_NO) + .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build(); ResponseParameters responseParameters = new ResponseParametersBuilder().build(); PathComputationRequestOutput pathComputationRequestOutput = new PathComputationRequestOutputBuilder() - .setConfigurationResponseCommon(configurationResponseCommon).setResponseParameters(responseParameters).build(); + .setConfigurationResponseCommon(configurationResponseCommon).setResponseParameters(responseParameters) + .build(); OperationResult result = - this.serviceDataStoreOperations.createServicePath(serviceInput, pathComputationRequestOutput); + this.serviceDataStoreOperations.createServicePath(serviceInput, pathComputationRequestOutput); Assert.assertFalse(result.isSuccess()); } @@ -254,17 +263,21 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { this.serviceDataStoreOperations.createService(createInput); ServiceInput serviceInput = new ServiceInput(createInput); ConfigurationResponseCommon configurationResponseCommon = new ConfigurationResponseCommonBuilder() - .setRequestId("request 1").setAckFinalIndicator(ResponseCodes.FINAL_ACK_NO) - .setResponseCode(ResponseCodes.RESPONSE_OK).setResponseMessage("PCE calculation in progress").build(); + .setRequestId("request 1").setAckFinalIndicator(ResponseCodes.FINAL_ACK_NO) + .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()).build(); + .setPathDescription(new PathDescriptionBuilder() + .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).build(); + .setConfigurationResponseCommon(configurationResponseCommon).setResponseParameters(responseParameters) + .build(); this.serviceDataStoreOperations.createServicePath(serviceInput, pathComputationRequestOutput); OperationResult result = this.serviceDataStoreOperations.deleteServicePath(serviceInput.getServiceName()); Assert.assertTrue(result.isSuccess()); } -} \ No newline at end of file +}