*/
package org.opendaylight.transportpce.servicehandler.service;
-import java.util.Optional;
+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.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.rev190624.PathComputationRequestOutput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.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 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")
@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
String result = serviceDataStoreOperations.writeOrModifyOrDeleteServiceList("serviceCreateInput",
createInput, pathComputationRequestOutput, 3);
- Assert.assertEquals("Service is not present ! ", result);
+ Assert.assertEquals(LogMessages.SERVICE_NOT_FOUND, result);
}
@Test
.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);
@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);
.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);
ServiceCreateInput createInput = ServiceDataUtils.buildServiceCreateInput();
this.serviceDataStoreOperations.createService(createInput);
OperationResult result = this.serviceDataStoreOperations.modifyService(createInput.getServiceName(),
- State.InService, State.InService);
+ State.InService, AdminStates.InService);
Assert.assertTrue(result.isSuccess());
}
@Test
public void getTempServiceFromEmptyDataStoreShouldBeEmpty() {
- Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.temp.service.list
+ Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.temp.service.list
.Services> optService = this.serviceDataStoreOperations.getTempService("service 1");
Assert.assertFalse(optService.isPresent());
}
TempServiceCreateInput createInput = ServiceDataUtils.buildTempServiceCreateInput();
this.serviceDataStoreOperations.createTempService(createInput);
- Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.temp.service.list
+ Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.temp.service.list
.Services> optService = this.serviceDataStoreOperations.getTempService(createInput.getCommonId());
Assert.assertTrue(optService.isPresent());
Assert.assertEquals(createInput.getCommonId(), optService.get().getCommonId());
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());
}
.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)
.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)