X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderer%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2Fprovisiondevice%2FDeviceRendererServiceImpl.java;h=8e2c89aac8d1897455b45874eef72cef863e898e;hb=d0a2e5c81e6512220e774d5c3ad11253d1e4c466;hp=78b72a22874dcc14682ffea4a6c0f7adde8b041e;hpb=869d6c3def408c3d984617a2dd4bada049db94a1;p=transportpce.git diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java index 78b72a228..8e2c89aac 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java @@ -8,13 +8,18 @@ package org.opendaylight.transportpce.renderer.provisiondevice; import com.google.common.collect.Sets; - +import com.google.common.util.concurrent.FluentFuture; +import java.math.BigDecimal; import java.util.ArrayList; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutionException; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ForkJoinTask; @@ -22,11 +27,12 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.eclipse.jdt.annotation.NonNull; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.ReadTransaction; +import org.opendaylight.mdsal.binding.api.WriteTransaction; +import org.opendaylight.mdsal.common.api.CommitInfo; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.crossconnect.CrossConnect; @@ -34,41 +40,45 @@ import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; +import org.opendaylight.transportpce.networkmodel.service.NetworkModelService; import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterfaceFactory; import org.opendaylight.transportpce.renderer.provisiondevice.servicepath.ServiceListTopology; import org.opendaylight.transportpce.renderer.provisiondevice.servicepath.ServicePathDirection; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.ServiceNodelist; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.NodelistBuilder; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.NodelistKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathOutput; -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.rev170228.renderer.rollback.output.FailedToRollback; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.renderer.rollback.output.FailedToRollbackBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.renderer.rollback.output.FailedToRollbackKey; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service.Topology; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.CreateOtsOmsInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.CreateOtsOmsOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.CreateOtsOmsOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.RendererRollbackInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.RendererRollbackOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.RendererRollbackOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.ServicePathInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.ServicePathOutput; +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.device.rev200128.renderer.rollback.output.FailedToRollback; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.renderer.rollback.output.FailedToRollbackBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.renderer.rollback.output.FailedToRollbackKey; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.service.Topology; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.OchAttributes.ModulationFormat; -import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.R100G; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceList; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.list.Services; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.list.ServicesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.list.ServicesKey; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.node.interfaces.NodeInterface; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.node.interfaces.NodeInterfaceBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.node.interfaces.NodeInterfaceKey; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.Nodes; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceList; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.Services; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.ServicesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.ServicesKey; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.node.interfaces.NodeInterface; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.node.interfaces.NodeInterfaceBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.node.interfaces.NodeInterfaceKey; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.Nodes; +import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev200129.OtnLinkType; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + public class DeviceRendererServiceImpl implements DeviceRendererService { + private static final String IS_NOT_MOUNTED_ON_THE_CONTROLLER = " is not mounted on the controller"; + private static final String ODU4 = "-ODU4"; private static final Logger LOG = LoggerFactory.getLogger(DeviceRendererServiceImpl.class); private final DataBroker dataBroker; private final DeviceTransactionManager deviceTransactionManager; @@ -76,33 +86,41 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { private final OpenRoadmInterfaces openRoadmInterfaces; private final CrossConnect crossConnect; private final PortMapping portMapping; + private final NetworkModelService networkModelService; public DeviceRendererServiceImpl(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager, OpenRoadmInterfaceFactory openRoadmInterfaceFactory, OpenRoadmInterfaces openRoadmInterfaces, - CrossConnect crossConnect, PortMapping portMapping) { + CrossConnect crossConnect, PortMapping portMapping, NetworkModelService networkModelService) { this.dataBroker = dataBroker; this.deviceTransactionManager = deviceTransactionManager; this.openRoadmInterfaceFactory = openRoadmInterfaceFactory; this.openRoadmInterfaces = openRoadmInterfaces; this.crossConnect = crossConnect; this.portMapping = portMapping; + this.networkModelService = networkModelService; } @Override public ServicePathOutput setupServicePath(ServicePathInput input, ServicePathDirection direction) { - List nodes = input.getNodes(); + List nodes = new ArrayList<>(); + if (input.getNodes() != null) { + nodes.addAll(input.getNodes()); + } // Register node for suppressing alarms if (!alarmSuppressionNodeRegistration(input)) { LOG.warn("Alarm suppresion node registration failed!!!!"); } ConcurrentLinkedQueue results = new ConcurrentLinkedQueue<>(); - Set nodeInterfaces = Sets.newConcurrentHashSet(); + Map nodeInterfaces = new ConcurrentHashMap<>(); Set nodesProvisioned = Sets.newConcurrentHashSet(); + CopyOnWriteArrayList otnNodesProvisioned = new CopyOnWriteArrayList<>(); ServiceListTopology topology = new ServiceListTopology(); AtomicBoolean success = new AtomicBoolean(true); ForkJoinPool forkJoinPool = new ForkJoinPool(); ForkJoinTask forkJoinTask = forkJoinPool.submit(() -> nodes.parallelStream().forEach(node -> { String nodeId = node.getNodeId(); + // take the index of the node + int nodeIndex = nodes.indexOf(node); LOG.info("Starting provisioning for node : {}", nodeId); List createdEthInterfaces = new ArrayList<>(); List createdOtuInterfaces = new ArrayList<>(); @@ -113,20 +131,50 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { try { // if the node is currently mounted then proceed if (this.deviceTransactionManager.isDeviceMounted(nodeId)) { + // TODO: In the case of flex-grid, the wave-number becomes bitmap index + // TODO: need to update transportpce-common-types accordingly, to a more, generic-term + Long waveNumber = input.getWaveNumber().toJava(); + BigDecimal centerFreq = null; + BigDecimal slotWidth = null; + if (input.getCenterFreq() != null) { + centerFreq = input.getCenterFreq().getValue(); + } + if (input.getSlotWidth() != null) { + slotWidth = input.getSlotWidth().getValue(); + } String srcTp = node.getSrcTp(); String destTp = node.getDestTp(); - Long waveNumber = input.getWaveNumber(); if ((destTp != null) && destTp.contains(StringConstants.NETWORK_TOKEN)) { crossConnectFlag++; - // create OpenRoadm Xponder Line Interfaces - String supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface( - nodeId, destTp, waveNumber, R100G.class, ModulationFormat.DpQpsk); + String supportingOchInterface; + if ((centerFreq != null) && (slotWidth != null)) { + supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface( + nodeId, destTp, waveNumber, ModulationFormat.DpQpsk, centerFreq, slotWidth); + } + else { + supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface( + nodeId, destTp, waveNumber, ModulationFormat.DpQpsk); + } createdOchInterfaces.add(supportingOchInterface); + // Here we pass logical connection-point of z-end to set SAPI and DAPI + Nodes tgtNode = null; + if (nodeIndex + 1 == nodes.size()) { + // For the end node, tgtNode becomes the first node in the list + tgtNode = nodes.get(0); + } else { + tgtNode = nodes.get(nodeIndex + 1); + } + // tgtNode srcTp is null in this if cond String supportingOtuInterface = this.openRoadmInterfaceFactory - .createOpenRoadmOtu4Interface(nodeId, destTp, supportingOchInterface); + .createOpenRoadmOtu4Interface(nodeId, destTp, supportingOchInterface, + tgtNode.getNodeId(), tgtNode.getDestTp()); createdOtuInterfaces.add(supportingOtuInterface); - createdOduInterfaces.add(this.openRoadmInterfaceFactory.createOpenRoadmOdu4Interface(nodeId, - destTp, supportingOtuInterface)); + if (srcTp == null) { + otnNodesProvisioned.add(node); + } else { + createdOduInterfaces.add(this.openRoadmInterfaceFactory.createOpenRoadmOdu4Interface(nodeId, + destTp, supportingOtuInterface)); + } } if ((srcTp != null) && srcTp.contains(StringConstants.CLIENT_TOKEN)) { crossConnectFlag++; @@ -137,14 +185,31 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { if ((srcTp != null) && srcTp.contains(StringConstants.NETWORK_TOKEN)) { crossConnectFlag++; // create OpenRoadm Xponder Line Interfaces - String supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface( - nodeId, srcTp, waveNumber, R100G.class, ModulationFormat.DpQpsk); + String supportingOchInterface; + if ((centerFreq != null) && (slotWidth != null)) { + supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface( + nodeId, srcTp, waveNumber, ModulationFormat.DpQpsk, centerFreq, slotWidth); + } + else { + supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface( + nodeId, srcTp, waveNumber, ModulationFormat.DpQpsk); + } createdOchInterfaces.add(supportingOchInterface); String supportingOtuInterface = this.openRoadmInterfaceFactory .createOpenRoadmOtu4Interface(nodeId, srcTp, supportingOchInterface); createdOtuInterfaces.add(supportingOtuInterface); createdOduInterfaces.add(this.openRoadmInterfaceFactory.createOpenRoadmOdu4Interface(nodeId, srcTp, supportingOtuInterface)); + Mapping mapping = this.portMapping.getMapping(nodeId,srcTp); + if (mapping != null && mapping.getXponderType() != null + && (mapping.getXponderType().getIntValue() == 3 + || mapping.getXponderType().getIntValue() == 2)) { + createdOduInterfaces.add(this.openRoadmInterfaceFactory + .createOpenRoadmOtnOdu4Interface(nodeId, destTp, supportingOtuInterface)); + } else { + createdOduInterfaces.add(this.openRoadmInterfaceFactory.createOpenRoadmOdu4Interface(nodeId, + destTp, supportingOtuInterface)); + } } if ((destTp != null) && destTp.contains(StringConstants.CLIENT_TOKEN)) { crossConnectFlag++; @@ -154,15 +219,31 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { } if ((srcTp != null) && (srcTp.contains(StringConstants.TTP_TOKEN) || srcTp.contains(StringConstants.PP_TOKEN))) { - createdOchInterfaces.addAll( - this.openRoadmInterfaceFactory - .createOpenRoadmOchInterface(nodeId, srcTp, waveNumber)); + if ((centerFreq != null) && (slotWidth != null)) { + createdOchInterfaces.addAll( + this.openRoadmInterfaceFactory + .createOpenRoadmOchInterface(nodeId, srcTp, waveNumber, centerFreq, slotWidth)); + } + else { + createdOchInterfaces.addAll( + this.openRoadmInterfaceFactory + .createOpenRoadmOchInterface(nodeId, srcTp, waveNumber)); + } } if ((destTp != null) && (destTp.contains(StringConstants.TTP_TOKEN) || destTp.contains(StringConstants.PP_TOKEN))) { - createdOchInterfaces.addAll( - this.openRoadmInterfaceFactory - .createOpenRoadmOchInterface(nodeId, destTp, waveNumber)); + + if ((centerFreq != null) && (slotWidth != null)) { + createdOchInterfaces.addAll( + this.openRoadmInterfaceFactory + .createOpenRoadmOchInterface(nodeId, destTp, waveNumber, centerFreq, slotWidth)); + } + else { + createdOchInterfaces.addAll( + this.openRoadmInterfaceFactory + .createOpenRoadmOchInterface(nodeId, destTp, waveNumber)); + } + } if (crossConnectFlag < 1) { LOG.info("Creating cross connect between source {} and destination {} for node {}", srcTp, @@ -171,14 +252,6 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { this.crossConnect.postCrossConnect(nodeId, waveNumber, srcTp, destTp); if (connectionNameOpt.isPresent()) { nodesProvisioned.add(nodeId); -// List ports = -// this.crossConnect.getConnectionPortTrail(nodeId, waveNumber, srcTp, destTp); -// if (ServicePathDirection.A_TO_Z.equals(direction)) { -// topology.updateAtoZTopologyList(ports, nodeId); -// } -// if (ServicePathDirection.Z_TO_A.equals(direction)) { -// topology.updateZtoATopologyList(ports, nodeId); -// } createdConnections.add(connectionNameOpt.get()); } else { processErrorMessage("Unable to post Roadm-connection for node " + nodeId, forkJoinPool, @@ -187,22 +260,23 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { } } } else { - processErrorMessage(nodeId + " is not mounted on the controller", forkJoinPool, results); + processErrorMessage(nodeId + IS_NOT_MOUNTED_ON_THE_CONTROLLER, forkJoinPool, results); success.set(false); } } catch (OpenRoadmInterfaceException ex) { processErrorMessage("Setup service path failed! Exception:" + ex.toString(), forkJoinPool, results); success.set(false); } - NodeInterfaceBuilder nodeInterfaceBuilder = new NodeInterfaceBuilder(); - nodeInterfaceBuilder.withKey(new NodeInterfaceKey(nodeId)); - nodeInterfaceBuilder.setNodeId(nodeId); - nodeInterfaceBuilder.setConnectionId(createdConnections); - nodeInterfaceBuilder.setEthInterfaceId(createdEthInterfaces); - nodeInterfaceBuilder.setOtuInterfaceId(createdOtuInterfaces); - nodeInterfaceBuilder.setOduInterfaceId(createdOduInterfaces); - nodeInterfaceBuilder.setOchInterfaceId(createdOchInterfaces); - nodeInterfaces.add(nodeInterfaceBuilder.build()); + NodeInterfaceBuilder nodeInterfaceBuilder = new NodeInterfaceBuilder() + .withKey(new NodeInterfaceKey(nodeId)) + .setNodeId(nodeId) + .setConnectionId(createdConnections) + .setEthInterfaceId(createdEthInterfaces) + .setOtuInterfaceId(createdOtuInterfaces) + .setOduInterfaceId(createdOduInterfaces) + .setOchInterfaceId(createdOchInterfaces); + NodeInterface nodeInterface = nodeInterfaceBuilder.build(); + nodeInterfaces.put(nodeInterface.key(),nodeInterface); })); try { forkJoinTask.get(); @@ -210,28 +284,30 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { LOG.error("Error while setting up service paths!", e); } forkJoinPool.shutdown(); + if (success.get()) { results.add("Roadm-connection successfully created for nodes: " + String.join(", ", nodesProvisioned)); } - ServicePathOutputBuilder setServBldr = new ServicePathOutputBuilder(); - setServBldr.setNodeInterface(new ArrayList<>(nodeInterfaces)); - setServBldr.setSuccess(success.get()); - setServBldr.setResult(String.join("\n", results)); // setting topology in the service list data store try { setTopologyForService(input.getServiceName(), topology.getTopology()); + updateOtnTopology(otnNodesProvisioned, false); } catch (InterruptedException | TimeoutException | ExecutionException e) { LOG.warn("Failed to write topologies for service {}.", input.getServiceName(), e); } if (!alarmSuppressionNodeRemoval(input.getServiceName())) { LOG.error("Alarm suppresion node removal failed!!!!"); } + ServicePathOutputBuilder setServBldr = new ServicePathOutputBuilder() + .setNodeInterface(nodeInterfaces) + .setSuccess(success.get()) + .setResult(String.join("\n", results)); return setServBldr.build(); } private ConcurrentLinkedQueue processErrorMessage(String message, ForkJoinPool forkJoinPool, ConcurrentLinkedQueue messages) { - LOG.warn(message); + LOG.warn("Received error message {}", message); messages.add(message); forkJoinPool.shutdown(); return messages; @@ -245,62 +321,38 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { if (!alarmSuppressionNodeRegistration(input)) { LOG.warn("Alarm suppresion node registraion failed!!!!"); } + CopyOnWriteArrayList otnNodesProvisioned = new CopyOnWriteArrayList<>(); ForkJoinPool forkJoinPool = new ForkJoinPool(); ForkJoinTask forkJoinTask = forkJoinPool.submit(() -> nodes.parallelStream().forEach(node -> { List interfacesToDelete = new LinkedList<>(); String nodeId = node.getNodeId(); LOG.info("Deleting service setup on node {}", nodeId); - String srcTp = node.getSrcTp(); - String destTp = node.getDestTp(); - Long waveNumber = input.getWaveNumber(); - if ((srcTp == null) || (destTp == null)) { - LOG.error("Source ({}) or destination ({}) termination point is null.", srcTp, destTp); + String srcTp; + String destTp; + Long waveNumber = input.getWaveNumber().toJava(); + if (node.getDestTp() == null) { + LOG.error("Destination termination point must not be null."); return; + } else { + destTp = node.getDestTp(); + } + if (node.getSrcTp() != null) { + srcTp = node.getSrcTp(); + } else { + srcTp = ""; + otnNodesProvisioned.add(node); } // if the node is currently mounted then proceed. if (this.deviceTransactionManager.isDeviceMounted(nodeId)) { - if (destTp.contains(StringConstants.NETWORK_TOKEN) - || srcTp.contains(StringConstants.CLIENT_TOKEN) - || srcTp.contains(StringConstants.NETWORK_TOKEN) - || destTp.contains(StringConstants.CLIENT_TOKEN)) { - if (destTp.contains(StringConstants.NETWORK_TOKEN)) { - interfacesToDelete.add(destTp + "-ODU"); - interfacesToDelete.add(destTp + "-OTU"); - interfacesToDelete.add( - this.openRoadmInterfaceFactory.createOpenRoadmOchInterfaceName(destTp, waveNumber)); - } - if (srcTp.contains(StringConstants.NETWORK_TOKEN)) { - interfacesToDelete.add(srcTp + "-ODU"); - interfacesToDelete.add(srcTp + "-OTU"); - interfacesToDelete - .add(this.openRoadmInterfaceFactory.createOpenRoadmOchInterfaceName(srcTp, waveNumber)); - } - if (srcTp.contains(StringConstants.CLIENT_TOKEN)) { - interfacesToDelete.add(srcTp + "-ETHERNET"); - } - if (destTp.contains(StringConstants.CLIENT_TOKEN)) { - interfacesToDelete.add(destTp + "-ETHERNET"); - } - } else { - String connectionNumber = srcTp + "-" + destTp + "-" + waveNumber; - List intToDelete = this.crossConnect.deleteCrossConnect(nodeId, connectionNumber); - connectionNumber = destTp + "-" + srcTp + "-" + waveNumber; - if (intToDelete != null) { - for (String interf : intToDelete) { - if (!this.openRoadmInterfaceFactory.isUsedbyXc(nodeId, interf, connectionNumber, - this.deviceTransactionManager)) { - interfacesToDelete.add(interf); - } - } - } - } + interfacesToDelete.addAll(getInterfaces2delete(nodeId, srcTp, destTp, waveNumber)); } else { - String result = nodeId + " is not mounted on the controller"; + String result = nodeId + IS_NOT_MOUNTED_ON_THE_CONTROLLER; results.add(result); success.set(false); LOG.warn(result); forkJoinPool.shutdown(); - return; // TODO should deletion end here? + return; + //TODO should deletion end here? } for (String interfaceId : interfacesToDelete) { try { @@ -319,6 +371,7 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { LOG.error("Error while deleting service paths!", e); } forkJoinPool.shutdown(); + updateOtnTopology(otnNodesProvisioned, true); if (!alarmSuppressionNodeRemoval(input.getServiceName())) { LOG.error("Alarm suppresion node removal failed!!!!"); } @@ -331,15 +384,66 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { } } + private List getInterfaces2delete( + String nodeId, String srcTp, String destTp, Long waveNumber) { + List interfacesToDelete = new LinkedList<>(); + if (destTp.contains(StringConstants.NETWORK_TOKEN) + || srcTp.contains(StringConstants.CLIENT_TOKEN) + || srcTp.contains(StringConstants.NETWORK_TOKEN) + || destTp.contains(StringConstants.CLIENT_TOKEN)) { + if (destTp.contains(StringConstants.NETWORK_TOKEN)) { + try { + if (this.openRoadmInterfaces.getInterface(nodeId, destTp + "-ODU").isPresent()) { + interfacesToDelete.add(destTp + "-ODU"); + } + if (this.openRoadmInterfaces.getInterface(nodeId, destTp + ODU4).isPresent()) { + interfacesToDelete.add(destTp + ODU4); + } + } + catch (OpenRoadmInterfaceException e) { + LOG.error("impossible to get interface {} or {}", destTp + "-ODU", destTp + ODU4, e); + } + interfacesToDelete.add(destTp + "-OTU"); + interfacesToDelete.add( + this.openRoadmInterfaceFactory.createOpenRoadmOchInterfaceName(destTp, waveNumber)); + } + if (srcTp.contains(StringConstants.NETWORK_TOKEN)) { + interfacesToDelete.add(srcTp + "-ODU"); + interfacesToDelete.add(srcTp + "-OTU"); + interfacesToDelete + .add(this.openRoadmInterfaceFactory.createOpenRoadmOchInterfaceName(srcTp, waveNumber)); + } + if (srcTp.contains(StringConstants.CLIENT_TOKEN)) { + interfacesToDelete.add(srcTp + "-ETHERNET"); + } + if (destTp.contains(StringConstants.CLIENT_TOKEN)) { + interfacesToDelete.add(destTp + "-ETHERNET"); + } + } else { + String connectionNumber = srcTp + "-" + destTp + "-" + waveNumber; + List intToDelete = this.crossConnect.deleteCrossConnect(nodeId, connectionNumber, false); + connectionNumber = destTp + "-" + srcTp + "-" + waveNumber; + if (intToDelete != null) { + for (String interf : intToDelete) { + if (!this.openRoadmInterfaceFactory.isUsedByXc(nodeId, interf, connectionNumber, + this.deviceTransactionManager)) { + interfacesToDelete.add(interf); + } + } + } + } + return interfacesToDelete; + } + @Override public RendererRollbackOutput rendererRollback(RendererRollbackInput input) { boolean success = true; - List failedToRollbackList = new ArrayList<>(); - for (NodeInterface nodeInterfaces : input.getNodeInterface()) { + Map failedToRollbackList = new HashMap<>(); + for (NodeInterface nodeInterfaces : input.nonnullNodeInterface().values()) { List failedInterfaces = new ArrayList<>(); String nodeId = nodeInterfaces.getNodeId(); for (String connectionId : nodeInterfaces.getConnectionId()) { - List listInter = this.crossConnect.deleteCrossConnect(nodeId, connectionId); + List listInter = this.crossConnect.deleteCrossConnect(nodeId, connectionId, false); if (listInter != null) { LOG.info("Cross connect {} on node {} successfully deleted.", connectionId, nodeId); } else { @@ -378,38 +482,43 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { failedInterfaces.add(interfaceId); } } - failedToRollbackList.add(new FailedToRollbackBuilder().withKey(new FailedToRollbackKey(nodeId)) - .setNodeId(nodeId).setInterface(failedInterfaces).build()); + FailedToRollback failedToRollack = new FailedToRollbackBuilder().withKey(new FailedToRollbackKey(nodeId)) + .setNodeId(nodeId).setInterface(failedInterfaces).build(); + failedToRollbackList.put(failedToRollack.key(),failedToRollack); } return new RendererRollbackOutputBuilder().setSuccess(success).setFailedToRollback(failedToRollbackList) .build(); } private boolean alarmSuppressionNodeRegistration(ServicePathInput input) { - NodelistBuilder nodeListBuilder = new NodelistBuilder(); - nodeListBuilder.withKey(new NodelistKey(input.getServiceName())); - nodeListBuilder.setServiceName(input.getServiceName()); - List nodeList = - new ArrayList<>(); - for (Nodes node : input.getNodes()) { - nodeList.add( - new org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102 - .service.nodelist.nodelist.NodesBuilder() - .setNodeId(node.getNodeId()).build()); + new HashMap<>(); + if (input.getNodes() != null) { + for (Nodes node : input.getNodes()) { + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102 + .service.nodelist.nodelist.Nodes nodes = + new org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102 + .service.nodelist.nodelist.NodesBuilder().setNodeId(node.getNodeId()).build(); + nodeList.put(nodes.key(),nodes); + } } nodeListBuilder.setNodes(nodeList); InstanceIdentifier nodeListIID = - InstanceIdentifier.create(ServiceNodelist.class).child( - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression - .rev171102.service.nodelist.Nodelist.class, - new NodelistKey(input.getServiceName())); + InstanceIdentifier.create(ServiceNodelist.class) + .child(org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102 + .service.nodelist.Nodelist.class, new NodelistKey(input.getServiceName())); final WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction(); writeTransaction.merge(LogicalDatastoreType.CONFIGURATION, nodeListIID, nodeListBuilder.build()); - Future submit = writeTransaction.submit(); + FluentFuture commit = writeTransaction.commit(); try { - submit.get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS); + commit.get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS); LOG.info("Nodes are register for alarm suppression for service: {}", input.getServiceName()); return true; } catch (ExecutionException | InterruptedException | TimeoutException e) { @@ -421,15 +530,14 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { private boolean alarmSuppressionNodeRemoval(String serviceName) { InstanceIdentifier nodeListIID = - InstanceIdentifier.create(ServiceNodelist.class).child( - org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression - .rev171102.service.nodelist.Nodelist.class, - new NodelistKey(serviceName)); + InstanceIdentifier.create(ServiceNodelist.class) + .child(org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102 + .service.nodelist.Nodelist.class, new NodelistKey(serviceName)); final WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction(); writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, nodeListIID); - Future submit = writeTransaction.submit(); + FluentFuture commit = writeTransaction.commit(); try { - submit.get(Timeouts.DATASTORE_DELETE, TimeUnit.MILLISECONDS); + commit.get(Timeouts.DATASTORE_DELETE, TimeUnit.MILLISECONDS); LOG.info("Nodes are unregister for alarm suppression for service: {}", serviceName); return true; } catch (InterruptedException | TimeoutException | ExecutionException e) { @@ -446,23 +554,22 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { InstanceIdentifier iid = InstanceIdentifier.create(ServiceList.class).child(Services.class, serviceKey); Optional services; - try (ReadOnlyTransaction readTx = this.dataBroker.newReadOnlyTransaction()) { - Future> future = + try (ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction()) { + Future> future = readTx.read(LogicalDatastoreType.OPERATIONAL, iid); - services = future.get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS).toJavaUtil(); + services = future.get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS); } catch (InterruptedException | ExecutionException | TimeoutException e) { throw e; } if (services.isPresent()) { - servicesBuilder = new ServicesBuilder(services.get()); + LOG.info("service {} already exists", name); + servicesBuilder = new ServicesBuilder(services.get()).setTopology(topo); + WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction(); + writeTx.merge(LogicalDatastoreType.OPERATIONAL, iid, servicesBuilder.build()); + writeTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS); } else { - servicesBuilder = new ServicesBuilder(); - servicesBuilder.withKey(serviceKey); + LOG.warn("Service {} does not exist - topology can not be updated", name); } - servicesBuilder.setTopology(topo); - WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction(); - writeTx.merge(LogicalDatastoreType.OPERATIONAL, iid, servicesBuilder.build()); - writeTx.submit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS); } @Override @@ -515,8 +622,8 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { + input.getNodeId(); } } else { - result = input.getNodeId() + " is not mounted on the controller"; - LOG.warn(result); + result = input.getNodeId() + IS_NOT_MOUNTED_ON_THE_CONTROLLER; + LOG.warn("{} is not mounted on the controller",input.getNodeId()); } return output.setResult(result).setSuccess(success).build(); } @@ -533,4 +640,20 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { } return result; } + + private void updateOtnTopology(CopyOnWriteArrayList nodes, boolean isDeletion) { + if (nodes.size() != 2) { + LOG.error("Error with OTU4 links to update in otn-topology"); + return; + } + if (isDeletion) { + LOG.info("updating otn-topology removing OTU4 links"); + this.networkModelService.deleteOtnLinks(nodes.get(0).getNodeId(), nodes.get(0).getDestTp(), + nodes.get(1).getNodeId(), nodes.get(1).getDestTp(), OtnLinkType.OTU4); + } else { + LOG.info("updating otn-topology adding OTU4 links"); + this.networkModelService.createOtnLinks(nodes.get(0).getNodeId(), nodes.get(0).getDestTp(), + nodes.get(1).getNodeId(), nodes.get(1).getDestTp(), OtnLinkType.OTU4); + } + } }