import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.opendaylight.controller.md.sal.binding.api.MountPoint;
-import org.opendaylight.controller.md.sal.binding.api.MountPointService;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
+import org.opendaylight.mdsal.binding.api.MountPoint;
+import org.opendaylight.mdsal.binding.api.MountPointService;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
import org.opendaylight.transportpce.common.ResponseCodes;
+import org.opendaylight.transportpce.common.StringConstants;
import org.opendaylight.transportpce.common.crossconnect.CrossConnect;
import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl;
+import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl121;
+import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl221;
import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl;
+import org.opendaylight.transportpce.common.fixedflex.FixedFlexImpl;
+import org.opendaylight.transportpce.common.fixedflex.FixedFlexInterface;
+import org.opendaylight.transportpce.common.mapping.MappingUtils;
+import org.opendaylight.transportpce.common.mapping.MappingUtilsImpl;
import org.opendaylight.transportpce.common.mapping.PortMapping;
import org.opendaylight.transportpce.common.mapping.PortMappingImpl;
+import org.opendaylight.transportpce.common.mapping.PortMappingVersion121;
+import org.opendaylight.transportpce.common.mapping.PortMappingVersion221;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl;
+import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl121;
+import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl221;
import org.opendaylight.transportpce.renderer.NetworkModelWavelengthService;
import org.opendaylight.transportpce.renderer.NetworkModelWavelengthServiceImpl;
+import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterface121;
+import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterface221;
import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterfaceFactory;
+import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmOtnInterface221;
import org.opendaylight.transportpce.renderer.stub.MountPointServiceStub;
import org.opendaylight.transportpce.renderer.stub.MountPointStub;
import org.opendaylight.transportpce.renderer.stub.OlmServiceStub;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.TransportpceOlmService;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.Measurements;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.MeasurementsBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathOutputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.ServicePathOutputBuilder;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.ServiceImplementationRequestInput;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.ServiceImplementationRequestOutput;
import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev161014.PmGranularity;
import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev161014.ResourceTypeEnum;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.get.pm.input.ResourceIdentifierBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200128.olm.get.pm.input.ResourceIdentifierBuilder;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
public class RendererServiceOperationsImplTest extends AbstractTest {
private CrossConnect crossConnect;
private TransportpceOlmService olmService;
private NetworkModelWavelengthService networkModelWavelengthService;
+ private MappingUtils mappingUtils;
+ private OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121;
+ private OpenRoadmInterfacesImpl221 openRoadmInterfacesImpl221;
+ private PortMappingVersion221 portMappingVersion22;
+ private PortMappingVersion121 portMappingVersion121;
+ private CrossConnectImpl121 crossConnectImpl121;
+ private CrossConnectImpl221 crossConnectImpl221;
private void setMountPoint(MountPoint mountPoint) {
this.mountPointService = new MountPointServiceStub(mountPoint);
this.deviceTransactionManager = new DeviceTransactionManagerImpl(this.mountPointService, 3000);
- this.openRoadmInterfaces = new OpenRoadmInterfacesImpl(this.deviceTransactionManager);
+ this.openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(deviceTransactionManager);
+ this.openRoadmInterfacesImpl221 = new OpenRoadmInterfacesImpl221(deviceTransactionManager);
+ this.mappingUtils = new MappingUtilsImpl(getDataBroker());
+ this.openRoadmInterfaces = new OpenRoadmInterfacesImpl(deviceTransactionManager, mappingUtils,
+ openRoadmInterfacesImpl121, openRoadmInterfacesImpl221);
this.openRoadmInterfaces = Mockito.spy(this.openRoadmInterfaces);
- this.portMapping = new PortMappingImpl(this.getDataBroker(), this.deviceTransactionManager,
- openRoadmInterfaces);
- this.openRoadmInterfaceFactory = new OpenRoadmInterfaceFactory(portMapping,
- openRoadmInterfaces);
- this.crossConnect = new CrossConnectImpl(this.deviceTransactionManager);
+ this.portMappingVersion22 =
+ new PortMappingVersion221(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces);
+ this.portMappingVersion121 =
+ new PortMappingVersion121(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces);
+ this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion22,
+ this.portMappingVersion121);
+ FixedFlexInterface fixedFlexInterface = new FixedFlexImpl();
+ OpenRoadmInterface121 openRoadmInterface121 = new OpenRoadmInterface121(portMapping,openRoadmInterfaces);
+ OpenRoadmInterface221 openRoadmInterface221 = new OpenRoadmInterface221(portMapping,openRoadmInterfaces,
+ fixedFlexInterface);
+ OpenRoadmOtnInterface221 openRoadmOTNInterface = new OpenRoadmOtnInterface221(portMapping, openRoadmInterfaces);
+ this.openRoadmInterfaceFactory = new OpenRoadmInterfaceFactory(this.mappingUtils,openRoadmInterface121,
+ openRoadmInterface221, openRoadmOTNInterface);
+ this.crossConnectImpl121 = new CrossConnectImpl121(deviceTransactionManager);
+ this.crossConnectImpl221 = new CrossConnectImpl221(deviceTransactionManager);
+ this.crossConnect = new CrossConnectImpl(deviceTransactionManager, this.mappingUtils, this.crossConnectImpl121,
+ this.crossConnectImpl221);
}
@Before
setMountPoint(new MountPointStub(getDataBroker()));
this.olmService = new OlmServiceStub();
this.networkModelWavelengthService = new NetworkModelWavelengthServiceImpl(getDataBroker());
- this.deviceRenderer = new DeviceRendererServiceImpl(this.getDataBroker(),
- this.deviceTransactionManager, openRoadmInterfaceFactory, openRoadmInterfaces, crossConnect, portMapping);
+ this.deviceRenderer = new DeviceRendererServiceImpl(this.getDataBroker(), this.deviceTransactionManager,
+ openRoadmInterfaceFactory, openRoadmInterfaces, crossConnect, portMapping, null);
Mockito.doNothing().when(this.openRoadmInterfaces).postEquipmentState(Mockito.anyString(),
Mockito.anyString(), Mockito.anyBoolean());
NotificationPublishService notificationPublishService = new NotificationPublishServiceMock();
public void serviceImplementationTerminationPointAsResourceTtp() throws InterruptedException, ExecutionException {
ServiceImplementationRequestInput input = ServiceDataUtils
- .buildServiceImplementationRequestInputTerminationPointResource(OpenRoadmInterfacesImpl.TTP_TOKEN);
- writePortMapping(input, OpenRoadmInterfacesImpl.TTP_TOKEN);
+ .buildServiceImplementationRequestInputTerminationPointResource(StringConstants.TTP_TOKEN);
+ writePortMapping(input, StringConstants.TTP_TOKEN);
ServicePathOutputBuilder mockOutputBuilder = new ServicePathOutputBuilder().setResult("success")
.setSuccess(true);
Mockito.doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(Mockito.any(),
public void serviceImplementationTerminationPointAsResourceTtp2() throws InterruptedException, ExecutionException {
ServiceImplementationRequestInput input = ServiceDataUtils
- .buildServiceImplementationRequestInputTerminationPointResource(OpenRoadmInterfacesImpl.TTP_TOKEN);
- writePortMapping(input, OpenRoadmInterfacesImpl.TTP_TOKEN);
+ .buildServiceImplementationRequestInputTerminationPointResource(StringConstants.TTP_TOKEN);
+ writePortMapping(input, StringConstants.TTP_TOKEN);
ServicePathOutputBuilder mockOutputBuilder = new ServicePathOutputBuilder().setResult("success")
.setSuccess(true);
Mockito.doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(Mockito.any(),
public void serviceImplementationTerminationPointAsResourcePp() throws InterruptedException, ExecutionException {
ServiceImplementationRequestInput input = ServiceDataUtils
- .buildServiceImplementationRequestInputTerminationPointResource(OpenRoadmInterfacesImpl.PP_TOKEN);
- writePortMapping(input, OpenRoadmInterfacesImpl.PP_TOKEN);
+ .buildServiceImplementationRequestInputTerminationPointResource(StringConstants.PP_TOKEN);
+ writePortMapping(input, StringConstants.PP_TOKEN);
ServicePathOutputBuilder mockOutputBuilder = new ServicePathOutputBuilder().setResult("success")
.setSuccess(true);
Mockito.doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(Mockito.any(),
throws InterruptedException, ExecutionException {
ServiceImplementationRequestInput input = ServiceDataUtils
- .buildServiceImplementationRequestInputTerminationPointResource(OpenRoadmInterfacesImpl.NETWORK_TOKEN);
- writePortMapping(input, OpenRoadmInterfacesImpl.NETWORK_TOKEN);
+ .buildServiceImplementationRequestInputTerminationPointResource(StringConstants.NETWORK_TOKEN);
+ writePortMapping(input, StringConstants.NETWORK_TOKEN);
ServicePathOutputBuilder mockOutputBuilder = new ServicePathOutputBuilder().setResult("success")
.setSuccess(true);
Mockito.doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(Mockito.any(),
throws InterruptedException, ExecutionException {
ServiceImplementationRequestInput input = ServiceDataUtils
- .buildServiceImplementationRequestInputTerminationPointResource(OpenRoadmInterfacesImpl.CLIENT_TOKEN);
- writePortMapping(input, OpenRoadmInterfacesImpl.CLIENT_TOKEN);
+ // .buildServiceImplementationRequestInputTerminationPointResource(OpenRoadmInterfacesImpl.CLIENT_TOKEN);
+ .buildServiceImplementationRequestInputTerminationPointResource(StringConstants.CLIENT_TOKEN);
+ // writePortMapping(input, OpenRoadmInterfacesImpl.CLIENT_TOKEN);
+ writePortMapping(input, StringConstants.CLIENT_TOKEN);
ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input).get();
Assert.assertEquals(ResponseCodes.RESPONSE_OK, result.getConfigurationResponseCommon().getResponseCode());
}
throws InterruptedException, ExecutionException {
String[] interfaceTokens = {
- OpenRoadmInterfacesImpl.NETWORK_TOKEN,
- OpenRoadmInterfacesImpl.CLIENT_TOKEN,
- OpenRoadmInterfacesImpl.TTP_TOKEN,
- OpenRoadmInterfacesImpl.PP_TOKEN
+ StringConstants.NETWORK_TOKEN,
+ StringConstants.CLIENT_TOKEN,
+ StringConstants.TTP_TOKEN,
+ StringConstants.PP_TOKEN
};
ServicePathOutputBuilder mockOutputBuilder = new ServicePathOutputBuilder().setResult("failed")
ServiceImplementationRequestOutput result =
this.rendererServiceOperations.serviceImplementation(input).get();
Assert.assertEquals(ResponseCodes.RESPONSE_FAILED,
- result.getConfigurationResponseCommon().getResponseCode());
+ result.getConfigurationResponseCommon().getResponseCode());
}
}
this.deviceTransactionManager
);
MountPointUtils.writeMapping(
- input.getServiceZEnd().getNodeId(),
- input.getServiceZEnd().getNodeId() + "-"
- + input.getServiceAEnd().getNodeId() + "-" + tpToken,
- this.deviceTransactionManager
+ input.getServiceZEnd().getNodeId(),
+ input.getServiceZEnd().getNodeId() + "-"
+ + input.getServiceAEnd().getNodeId() + "-" + tpToken,
+ this.deviceTransactionManager
);
MountPointUtils.writeMapping(
- input.getServiceAEnd().getNodeId(),
- input.getServiceAEnd().getNodeId() + "-"
- + input.getServiceZEnd().getNodeId() + "-" + tpToken,
- this.deviceTransactionManager
+ input.getServiceAEnd().getNodeId(),
+ input.getServiceAEnd().getNodeId() + "-"
+ + input.getServiceZEnd().getNodeId() + "-" + tpToken,
+ this.deviceTransactionManager
);
MountPointUtils.writeMapping(
input.getServiceZEnd().getNodeId(),
public void serviceImplementationRollbackAllNecessary() throws InterruptedException, ExecutionException {
ServiceImplementationRequestInput input = ServiceDataUtils
- .buildServiceImplementationRequestInputTerminationPointResource(OpenRoadmInterfacesImpl.NETWORK_TOKEN);
- writePortMapping(input, OpenRoadmInterfacesImpl.NETWORK_TOKEN);
+ .buildServiceImplementationRequestInputTerminationPointResource(StringConstants.NETWORK_TOKEN);
+ writePortMapping(input, StringConstants.NETWORK_TOKEN);
Mockito.doReturn(RpcResultBuilder.failed().buildFuture()).when(this.olmService)
.servicePowerSetup(Mockito.any());
ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input).get();
public void serviceImplementationServiceInActive() throws InterruptedException, ExecutionException {
ServiceImplementationRequestInput input = ServiceDataUtils
- .buildServiceImplementationRequestInputTerminationPointResource(OpenRoadmInterfacesImpl.NETWORK_TOKEN);
- writePortMapping(input, OpenRoadmInterfacesImpl.NETWORK_TOKEN);
+ .buildServiceImplementationRequestInputTerminationPointResource(StringConstants.NETWORK_TOKEN);
+ writePortMapping(input, StringConstants.NETWORK_TOKEN);
Measurements measurements = new MeasurementsBuilder().setPmparameterName("FECUncorrectableBlocks")
.setPmparameterValue("1").build();
List<Measurements> measurementsList = new ArrayList<Measurements>();
public void serviceImplementationServiceInActive2() throws InterruptedException, ExecutionException {
ServiceImplementationRequestInput input = ServiceDataUtils
- .buildServiceImplementationRequestInputTerminationPointResource(OpenRoadmInterfacesImpl.NETWORK_TOKEN);
- writePortMapping(input, OpenRoadmInterfacesImpl.NETWORK_TOKEN);
+ .buildServiceImplementationRequestInputTerminationPointResource(StringConstants.NETWORK_TOKEN);
+ writePortMapping(input, StringConstants.NETWORK_TOKEN);
Measurements measurements = new MeasurementsBuilder().setPmparameterName("FECUncorrectableBlocks")
.setPmparameterValue("1").build();
List<Measurements> measurementsList = new ArrayList<Measurements>();
public void serviceImplementationServiceInActive3() throws InterruptedException, ExecutionException {
ServiceImplementationRequestInput input = ServiceDataUtils
- .buildServiceImplementationRequestInputTerminationPointResource(OpenRoadmInterfacesImpl.NETWORK_TOKEN);
- writePortMapping(input, OpenRoadmInterfacesImpl.NETWORK_TOKEN);
+ .buildServiceImplementationRequestInputTerminationPointResource(StringConstants.NETWORK_TOKEN);
+ writePortMapping(input, StringConstants.NETWORK_TOKEN);
Measurements measurements = new MeasurementsBuilder().setPmparameterName("FECUncorrectableBlocks")
.setPmparameterValue("1").build();
List<Measurements> measurementsList = new ArrayList<Measurements>();
measurementsList.add(measurements);
GetPmOutput getPmOutput = new GetPmOutputBuilder()
- .setNodeId("node1").setMeasurements(measurementsList).build();
+ .setNodeId("node1").setMeasurements(measurementsList).build();
GetPmOutput getPmOutput2 = new GetPmOutputBuilder()
- .setNodeId("node1").setMeasurements(new ArrayList<>()).build();
+ .setNodeId("node1").setMeasurements(new ArrayList<>()).build();
GetPmInput getPmInputZ = createGetPmInput("XPONDER-2-3",
- OpenRoadmInterfacesImpl.NETWORK_TOKEN);
+ StringConstants.NETWORK_TOKEN);
GetPmInput getPmInputA = createGetPmInput("XPONDER-1-2",
- OpenRoadmInterfacesImpl.NETWORK_TOKEN);
+ StringConstants.NETWORK_TOKEN);
Mockito.when(this.olmService.getPm(Mockito.eq(getPmInputZ)))
.thenReturn(RpcResultBuilder.success(getPmOutput2).buildFuture());
public void serviceImplementationServiceActive() throws InterruptedException, ExecutionException {
ServiceImplementationRequestInput input = ServiceDataUtils
- .buildServiceImplementationRequestInputTerminationPointResource(OpenRoadmInterfacesImpl.NETWORK_TOKEN);
- writePortMapping(input, OpenRoadmInterfacesImpl.NETWORK_TOKEN);
+ .buildServiceImplementationRequestInputTerminationPointResource(StringConstants.NETWORK_TOKEN);
+ writePortMapping(input, StringConstants.NETWORK_TOKEN);
GetPmOutput getPmOutput = new GetPmOutputBuilder()
.setNodeId("node1").setMeasurements(new ArrayList<>()).build();
GetPmOutput getPmOutput1 = null;
public void serviceImplementationServiceActive2() throws InterruptedException, ExecutionException {
ServiceImplementationRequestInput input = ServiceDataUtils
- .buildServiceImplementationRequestInputTerminationPointResource(OpenRoadmInterfacesImpl.NETWORK_TOKEN);
- writePortMapping(input, OpenRoadmInterfacesImpl.NETWORK_TOKEN);
+ .buildServiceImplementationRequestInputTerminationPointResource(StringConstants.NETWORK_TOKEN);
+ writePortMapping(input, StringConstants.NETWORK_TOKEN);
GetPmOutput getPmOutput = new GetPmOutputBuilder().setMeasurements(new ArrayList<>()).build();
Mockito.when(this.olmService.getPm(Mockito.any())).thenReturn(RpcResultBuilder.success(getPmOutput)
.buildFuture());
public void serviceImplementationServiceInActive4() throws InterruptedException, ExecutionException {
ServiceImplementationRequestInput input = ServiceDataUtils
- .buildServiceImplementationRequestInputTerminationPointResource(OpenRoadmInterfacesImpl.NETWORK_TOKEN);
- writePortMapping(input, OpenRoadmInterfacesImpl.NETWORK_TOKEN);
+ .buildServiceImplementationRequestInputTerminationPointResource(StringConstants.NETWORK_TOKEN);
+ writePortMapping(input, StringConstants.NETWORK_TOKEN);
Measurements measurements = new MeasurementsBuilder().setPmparameterName("preFECCorrectedErrors")
.setPmparameterValue("1").build();
List<Measurements> measurementsList = new ArrayList<Measurements>();
public void serviceImplementationServiceInActive5() throws InterruptedException, ExecutionException {
ServiceImplementationRequestInput input = ServiceDataUtils
- .buildServiceImplementationRequestInputTerminationPointResource(OpenRoadmInterfacesImpl.NETWORK_TOKEN);
- writePortMapping(input, OpenRoadmInterfacesImpl.NETWORK_TOKEN);
+ .buildServiceImplementationRequestInputTerminationPointResource(StringConstants.NETWORK_TOKEN);
+ writePortMapping(input, StringConstants.NETWORK_TOKEN);
Measurements measurements = new MeasurementsBuilder().setPmparameterName("preFECCorrectedErrors")
.setPmparameterValue("112000000000d").build();
List<Measurements> measurementsList = new ArrayList<Measurements>();
Code Review / transportpce.git / blobdiff