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=0f40f3842918b3d4e1f637d808e421ba558678ff;hb=6ae7f17afc50195ff2449043e65341e28c1056e3;hp=3d84b258015a1b00c87e9f9eda14176f3a86a1f4;hpb=5a59a59e40a4c6d8176666965f469d0c3f6d7487;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 3d84b2580..0f40f3842 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 @@ -22,15 +22,16 @@ 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.rev220808.PathComputationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.PathComputationRequestOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.configuration.response.common.ConfigurationResponseCommon; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev211210.configuration.response.common.ConfigurationResponseCommonBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.PathComputationRequestOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.PathComputationRequestOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.service.path.rpc.result.PathDescription; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev230526.configuration.response.common.ConfigurationResponseCommon; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev230526.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.rev211210.ServiceCreateInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.TempServiceCreateInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.list.Services; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceCreateInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.TempServiceCreateInput; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.list.Services; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev230501.path.description.AToZDirectionBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev230501.path.description.ZToADirectionBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.response.parameters.sp.ResponseParameters; @@ -174,7 +175,7 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { @Test void getTempServiceFromEmptyDataStoreShouldBeEmpty() { - Optional optService = this.serviceDataStoreOperations.getTempService("service 1"); assertFalse(optService.isPresent()); } @@ -182,16 +183,18 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { @Test void createTempServiceShouldBeSuccessForValidInput() { TempServiceCreateInput createInput = ServiceDataUtils.buildTempServiceCreateInput(); - OperationResult result = this.serviceDataStoreOperations.createTempService(createInput); + PathDescription pathDescription = ServiceDataUtils.createPathDescription(0,1, 0, 1); + OperationResult result = this.serviceDataStoreOperations.createTempService(createInput, pathDescription); assertTrue(result.isSuccess()); } @Test void getTempServiceShouldReturnTheCorrectTempServiceForTheCreatedService() { TempServiceCreateInput createInput = ServiceDataUtils.buildTempServiceCreateInput(); - this.serviceDataStoreOperations.createTempService(createInput); + PathDescription pathDescription = ServiceDataUtils.createPathDescription(0,1, 0, 1); + this.serviceDataStoreOperations.createTempService(createInput, pathDescription); - Optional optService = this.serviceDataStoreOperations.getTempService(createInput.getCommonId()); assertTrue(optService.isPresent()); assertEquals(createInput.getCommonId(), optService.orElseThrow().getCommonId()); @@ -200,7 +203,8 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { @Test void deleteTempServiceShouldBeSuccessfulForDeletingTempService() { TempServiceCreateInput createInput = ServiceDataUtils.buildTempServiceCreateInput(); - this.serviceDataStoreOperations.createTempService(createInput); + PathDescription pathDescription = ServiceDataUtils.createPathDescription(0,1, 0, 1); + this.serviceDataStoreOperations.createTempService(createInput, pathDescription); OperationResult result = this.serviceDataStoreOperations.deleteTempService(createInput.getCommonId()); assertTrue(result.isSuccess()); } @@ -208,7 +212,8 @@ public class ServiceDataStoreOperationsImplTest extends AbstractTest { @Test void modifyTempServiceIsSuccessfulForPresentTempService() { TempServiceCreateInput createInput = ServiceDataUtils.buildTempServiceCreateInput(); - this.serviceDataStoreOperations.createTempService(createInput); + PathDescription pathDescription = ServiceDataUtils.createPathDescription(0,1, 0, 1); + this.serviceDataStoreOperations.createTempService(createInput, pathDescription); OperationResult result = this.serviceDataStoreOperations.modifyTempService( createInput.getCommonId(), State.InService, AdminStates.InService); assertTrue(result.isSuccess());