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.CrossConnectImpl22;
+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.PortMappingVersion22;
+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.OpenRoadmInterfacesImpl22;
+import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl221;
+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.provisiondevice.servicepath.ServicePathDirection;
import org.opendaylight.transportpce.renderer.stub.MountPointServiceStub;
private OpenRoadmInterfaces openRoadmInterfaces;
private MappingUtils mappingUtils;
private OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121;
- private OpenRoadmInterfacesImpl22 openRoadmInterfacesImpl22;
- private PortMappingVersion22 portMappingVersion22;
+ private OpenRoadmInterfacesImpl221 openRoadmInterfacesImpl221;
+ private PortMappingVersion221 portMappingVersion22;
private PortMappingVersion121 portMappingVersion121;
private CrossConnectImpl121 crossConnectImpl121;
- private CrossConnectImpl22 crossConnectImpl22;
+ private CrossConnectImpl221 crossConnectImpl221;
private void setMountPoint(MountPoint mountPoint) {
MountPointService mountPointService = new MountPointServiceStub(mountPoint);
this.deviceTransactionManager = new DeviceTransactionManagerImpl(mountPointService, 3000);
this.openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(deviceTransactionManager);
- this.openRoadmInterfacesImpl22 = new OpenRoadmInterfacesImpl22(deviceTransactionManager);
- this.mappingUtils = new MappingUtilsImpl(getDataBroker());
- this.mappingUtils = Mockito.spy(this.mappingUtils);
+ this.openRoadmInterfacesImpl221 = new OpenRoadmInterfacesImpl221(deviceTransactionManager);
+ this.mappingUtils = Mockito.spy(MappingUtils.class);
+
+ Mockito.doReturn(StringConstants.OPENROADM_DEVICE_VERSION_1_2_1).when(mappingUtils)
+ .getOpenRoadmVersion(Mockito.anyString());
+
this.openRoadmInterfaces = new OpenRoadmInterfacesImpl(deviceTransactionManager, mappingUtils,
- openRoadmInterfacesImpl121, openRoadmInterfacesImpl22);
+ openRoadmInterfacesImpl121, openRoadmInterfacesImpl221);
this.openRoadmInterfaces = Mockito.spy(this.openRoadmInterfaces);
this.portMappingVersion22 =
- new PortMappingVersion22(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces);
+ new PortMappingVersion221(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces);
this.portMappingVersion121 =
- new PortMappingVersion121(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces);
- this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion22, this.mappingUtils,
- this.portMappingVersion121);
+ new PortMappingVersion121(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces);
+ this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion22,
+ this.portMappingVersion121);
this.portMapping = Mockito.spy(this.portMapping);
this.crossConnectImpl121 = new CrossConnectImpl121(deviceTransactionManager);
- this.crossConnectImpl22 = new CrossConnectImpl22(deviceTransactionManager);
+ this.crossConnectImpl221 = new CrossConnectImpl221(deviceTransactionManager);
this.crossConnect = new CrossConnectImpl(deviceTransactionManager, this.mappingUtils, this.crossConnectImpl121,
- this.crossConnectImpl22);
+ this.crossConnectImpl221);
this.crossConnect = Mockito.spy(this.crossConnect);
- OpenRoadmInterfaceFactory openRoadmInterfaceFactory =
- new OpenRoadmInterfaceFactory(this.portMapping, this.openRoadmInterfaces);
+
+
+ FixedFlexInterface fixedFlexInterface = new FixedFlexImpl();
+ OpenRoadmInterface121 openRoadmInterface121 = new OpenRoadmInterface121(portMapping,openRoadmInterfaces);
+ OpenRoadmInterface221 openRoadmInterface221 = new OpenRoadmInterface221(portMapping,openRoadmInterfaces,
+ fixedFlexInterface);
+ OpenRoadmInterfaceFactory openRoadmInterfaceFactory = new OpenRoadmInterfaceFactory(this.mappingUtils,
+ openRoadmInterface121,openRoadmInterface221);
+
this.deviceRendererService = new DeviceRendererServiceImpl(this.getDataBroker(),
- this.deviceTransactionManager, openRoadmInterfaceFactory, openRoadmInterfaces, crossConnect,
+ this.deviceTransactionManager, openRoadmInterfaceFactory, openRoadmInterfaces, crossConnect,
portMapping);
}
public void testSetupServicemptyPorts() {
setMountPoint(MountPointUtils.getMountPoint(new ArrayList<>(), getDataBroker()));
String nodeId = "node1";
- String srcTP = OpenRoadmInterfacesImpl.TTP_TOKEN;
- String dstTp = OpenRoadmInterfacesImpl.PP_TOKEN;
+ String srcTP = StringConstants.TTP_TOKEN;
+ String dstTp = StringConstants.PP_TOKEN;
List<Nodes> nodes = new ArrayList<>();
nodes.add(ServiceImplementationDataUtils.createNode(nodeId, srcTP, dstTp));
ServicePathInput servicePathInput = ServiceImplementationDataUtils.buildServicePathInputs(nodes);
for (ServicePathDirection servicePathDirection : ServicePathDirection.values()) {
ServicePathOutput servicePathOutput = deviceRendererService.setupServicePath(servicePathInput,
- servicePathDirection);
+ servicePathDirection);
Assert.assertFalse(servicePathOutput.isSuccess());
}
}
public void testSetupServiceCannotCrossConnect() {
setMountPoint(MountPointUtils.getMountPoint(new ArrayList<>(), getDataBroker()));
String nodeId = "node1";
- String srcTP = OpenRoadmInterfacesImpl.TTP_TOKEN;
- String dstTp = OpenRoadmInterfacesImpl.PP_TOKEN;
+ String srcTP = StringConstants.TTP_TOKEN;
+ String dstTp = StringConstants.PP_TOKEN;
MountPointUtils.writeMapping(nodeId, srcTP, this.deviceTransactionManager);
MountPointUtils.writeMapping(nodeId, dstTp, this.deviceTransactionManager);
List<Nodes> nodes = new ArrayList<>();
nodes.add(ServiceImplementationDataUtils.createNode(nodeId, srcTP, dstTp));
ServicePathInput servicePathInput = ServiceImplementationDataUtils.buildServicePathInputs(nodes);
Mockito.doReturn(StringConstants.OPENROADM_DEVICE_VERSION_1_2_1).when(this.mappingUtils)
- .getOpenRoadmVersion("node1");
+ .getOpenRoadmVersion("node1");
Mockito.doReturn(java.util.Optional.empty()).when(this.crossConnect).postCrossConnect(nodeId, 20L, srcTP,
dstTp);
ServicePathOutput servicePathOutput = deviceRendererService.setupServicePath(servicePathInput,
- ServicePathDirection.A_TO_Z);
+ ServicePathDirection.A_TO_Z);
Assert.assertFalse(servicePathOutput.isSuccess());
}
Mockito.doNothing().when(this.openRoadmInterfaces).postEquipmentState(Mockito.anyString(),
Mockito.anyString(), Mockito.anyBoolean());
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
};
String nodeId = "node1";
MountPointUtils.writeMapping(nodeId, dstTp, this.deviceTransactionManager);
boolean connectingUsingCrossConnect = true;
- if (OpenRoadmInterfacesImpl.NETWORK_TOKEN.equals(srcToken)
- || OpenRoadmInterfacesImpl.CLIENT_TOKEN.equals(srcToken)) {
+ if (StringConstants.NETWORK_TOKEN.equals(srcToken)
+ || StringConstants.CLIENT_TOKEN.equals(srcToken)) {
connectingUsingCrossConnect = false;
}
- if (OpenRoadmInterfacesImpl.NETWORK_TOKEN.equals(dstToken)
- || OpenRoadmInterfacesImpl.CLIENT_TOKEN.equals(dstToken)) {
+ if (StringConstants.NETWORK_TOKEN.equals(dstToken)
+ || StringConstants.CLIENT_TOKEN.equals(dstToken)) {
connectingUsingCrossConnect = false;
}
nodes.add(ServiceImplementationDataUtils.createNode(nodeId, srcTP, dstTp));
ServicePathInput servicePathInput = ServiceImplementationDataUtils.buildServicePathInputs(nodes);
Mockito.doReturn(StringConstants.OPENROADM_DEVICE_VERSION_1_2_1).when(this.mappingUtils)
- .getOpenRoadmVersion("node1");
+ .getOpenRoadmVersion("node1");
for (ServicePathDirection servicePathDirection : ServicePathDirection.values()) {
ServicePathOutput servicePathOutput = deviceRendererService.setupServicePath(servicePathInput,
- servicePathDirection);
+ servicePathDirection);
Assert.assertTrue(servicePathOutput.isSuccess());
String expectedResult = "Roadm-connection successfully created for nodes: ";
if (connectingUsingCrossConnect) {
nodes.add(ServiceImplementationDataUtils.createNode(nodeId, srcTP, dstTp));
ServicePathInput servicePathInput = ServiceImplementationDataUtils.buildServicePathInputs(nodes);
Mockito.doReturn(StringConstants.OPENROADM_DEVICE_VERSION_1_2_1).when(this.mappingUtils)
- .getOpenRoadmVersion("node1");
+ .getOpenRoadmVersion("node1");
for (ServicePathDirection servicePathDirection : ServicePathDirection.values()) {
ServicePathOutput servicePathOutput = deviceRendererService.setupServicePath(servicePathInput,
- servicePathDirection);
+ servicePathDirection);
Assert.assertTrue(servicePathOutput.isSuccess());
String expectedResult = "Roadm-connection successfully created for nodes: ";
expectedResult = expectedResult + nodeId;
Assert.assertEquals(nodeId, servicePathOutput.getNodeInterface().get(0).getNodeId());
}
}
-}
+}
\ No newline at end of file