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=2ffa8be2598540b41541a52d4276b223cacf7004;hb=f327d205217ec8eefa4326881f8d06f1378db37a;hp=bf2b343e01f46beb9ced8bf9634b66662995def7;hpb=c10e4140f3cc89f7b4d635d7a370209d8a1e15ff;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 bf2b343e0..2ffa8be25 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 @@ -9,8 +9,11 @@ package org.opendaylight.transportpce.renderer.provisiondevice; import com.google.common.collect.Sets; import com.google.common.util.concurrent.FluentFuture; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -39,10 +42,10 @@ import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.fixedflex.GridConstant; import org.opendaylight.transportpce.common.fixedflex.GridUtils; import org.opendaylight.transportpce.common.fixedflex.SpectrumInformation; +import org.opendaylight.transportpce.common.mapping.MappingUtils; 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; @@ -63,24 +66,27 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.re import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.renderer.rollback.output.FailedToRollback; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.renderer.rollback.output.FailedToRollbackBuilder; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.renderer.rollback.output.FailedToRollbackKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.OpenroadmNodeVersion; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220114.mapping.Mapping; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.service.Topology; -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.rev210930.link.tp.LinkTp; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.link.tp.LinkTpBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.node.interfaces.NodeInterface; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.node.interfaces.NodeInterfaceBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.node.interfaces.NodeInterfaceKey; -import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.optical.renderer.nodes.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.OpenroadmNodeVersion; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mapping.Mapping; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev230526.service.Topology; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.ServiceList; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.list.Services; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.list.ServicesBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev230526.service.list.ServicesKey; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.link.tp.LinkTp; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.link.tp.LinkTpBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.node.interfaces.NodeInterface; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.node.interfaces.NodeInterfaceBuilder; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.node.interfaces.NodeInterfaceKey; +import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.optical.renderer.nodes.Nodes; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Reference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - +@Component public class DeviceRendererServiceImpl implements DeviceRendererService { private static final String IS_NOT_MOUNTED_ON_THE_CONTROLLER = " is not mounted on the controller"; private static final Logger LOG = LoggerFactory.getLogger(DeviceRendererServiceImpl.class); @@ -91,18 +97,20 @@ 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, NetworkModelService networkModelService) { + @Activate + public DeviceRendererServiceImpl(@Reference DataBroker dataBroker, + @Reference DeviceTransactionManager deviceTransactionManager, + @Reference OpenRoadmInterfaces openRoadmInterfaces, + @Reference CrossConnect crossConnect, + @Reference MappingUtils mappingUtils, + @Reference PortMapping portMapping) { this.dataBroker = dataBroker; this.deviceTransactionManager = deviceTransactionManager; - this.openRoadmInterfaceFactory = openRoadmInterfaceFactory; this.openRoadmInterfaces = openRoadmInterfaces; this.crossConnect = crossConnect; this.portMapping = portMapping; - this.networkModelService = networkModelService; + this.openRoadmInterfaceFactory = new OpenRoadmInterfaceFactory(mappingUtils, portMapping, openRoadmInterfaces); } @SuppressWarnings("rawtypes") @@ -130,8 +138,6 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { 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); AEndApiInfo apiInfoA = null; ZEndApiInfo apiInfoZ = null; @@ -141,11 +147,11 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { if (input.getZEndApiInfo() != null && input.getZEndApiInfo().getNodeId().contains(nodeId)) { apiInfoZ = input.getZEndApiInfo(); } - List createdEthInterfaces = new ArrayList<>(); - List createdOtuInterfaces = new ArrayList<>(); - List createdOduInterfaces = new ArrayList<>(); - List createdOchInterfaces = new ArrayList<>(); - List createdConnections = new ArrayList<>(); + Set createdEthInterfaces = new HashSet<>(); + Set createdOtuInterfaces = new HashSet<>(); + Set createdOduInterfaces = new HashSet<>(); + Set createdOchInterfaces = new HashSet<>(); + Set createdConnections = new HashSet<>(); int crossConnectFlag = 0; try { // if the node is currently mounted then proceed @@ -158,15 +164,34 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { crossConnectFlag++; String supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface( nodeId, destTp, spectrumInformation); - createdOchInterfaces.add(supportingOchInterface); - String supportingOtuInterface = this.openRoadmInterfaceFactory.createOpenRoadmOtu4Interface( - nodeId, destTp, supportingOchInterface, apiInfoA, apiInfoZ); + // Split the string based on # pass the last element as the supported Interface + // This is needed for 7.1 device models with B100G, we have OTSI, OTSI-group combined as OCH + String[] listOfSuppOchInf = supportingOchInterface.split("#"); + List createdOchInf = Arrays.asList(listOfSuppOchInf); + createdOchInterfaces.addAll(createdOchInf); + LOG.info("DEST all otsi interfaces {}", createdOchInterfaces); + // Taking the last element + supportingOchInterface = listOfSuppOchInf[createdOchInf.size() - 1]; + String supportingOtuInterface = this.openRoadmInterfaceFactory + .createOpenRoadmOtu4Interface(nodeId, destTp, supportingOchInterface, apiInfoA, + apiInfoZ); createdOtuInterfaces.add(supportingOtuInterface); + LOG.info("all dest otu interfaces {}", createdOtuInterfaces); if (srcTp == null) { otnLinkTps.add(new LinkTpBuilder().setNodeId(nodeId).setTpId(destTp).build()); + } else if (srcTp.contains(StringConstants.NETWORK_TOKEN)) { + // If src and dest tp contains the network token, then it is regenerator + LOG.info("Create the ODUCn for regen on the dest-tp"); + // Here we first create ODUCn interface for the Regen + createdOduInterfaces.add(this.openRoadmInterfaceFactory + .createOpenRoadmOducn(nodeId, destTp)); + LOG.info("all dest odu interfaces {}", createdOduInterfaces); } else { - createdOduInterfaces.add(this.openRoadmInterfaceFactory.createOpenRoadmOdu4HOInterface( - nodeId, destTp, false, apiInfoA, apiInfoZ, PT_07)); + // This is needed for 7.1 device models for 400GE, since we have ODUC4 and ODUflex + // are combined + createdOduInterfaces = Set.of(this.openRoadmInterfaceFactory + .createOpenRoadmOdu4HOInterface( + nodeId, destTp, false, apiInfoA, apiInfoZ, PT_07).split("#")); } } if ((srcTp != null) && srcTp.contains(StringConstants.CLIENT_TOKEN)) { @@ -183,12 +208,26 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { // create OpenRoadm Xponder Line Interfaces String supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface( nodeId, srcTp, spectrumInformation); - createdOchInterfaces.add(supportingOchInterface); + // createdOchInterfaces.add(supportingOchInterface); + // Split the string based on # pass the last element as the supported Interface + // This is needed for 7.1 device models with B100G, we have OTSI, OTSI-group combined as OCH + String[] listOfSuppOchInf = supportingOchInterface.split("#"); + List tmpCreatedOchInterfaces = Arrays.asList(listOfSuppOchInf); + createdOchInterfaces.addAll(tmpCreatedOchInterfaces); + // Taking the last element + supportingOchInterface = tmpCreatedOchInterfaces.get(tmpCreatedOchInterfaces.size() - 1); String supportingOtuInterface = this.openRoadmInterfaceFactory.createOpenRoadmOtu4Interface( nodeId, srcTp, supportingOchInterface, apiInfoA, apiInfoZ); createdOtuInterfaces.add(supportingOtuInterface); if (destTp == null) { otnLinkTps.add(new LinkTpBuilder().setNodeId(nodeId).setTpId(srcTp).build()); + } else if (destTp.contains(StringConstants.NETWORK_TOKEN)) { + // If the src and dest tp have network-token, then it is a regen + LOG.info("Create the regen-interfaces on the src-tp"); + // Here we first create ODUCn interface for the Regen + createdOduInterfaces.add(this.openRoadmInterfaceFactory.createOpenRoadmOducn(nodeId, + srcTp)); + LOG.info("all src odu interfaces {}", createdOduInterfaces); } else { createdOduInterfaces.add(this.openRoadmInterfaceFactory.createOpenRoadmOdu4HOInterface( nodeId, srcTp, false, apiInfoA, apiInfoZ, PT_07)); @@ -222,7 +261,7 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { this.crossConnect.postCrossConnect(nodeId, srcTp, destTp, spectrumInformation); if (connectionNameOpt.isPresent()) { nodesProvisioned.add(nodeId); - createdConnections.add(connectionNameOpt.get()); + createdConnections.add(connectionNameOpt.orElseThrow()); } else { processErrorMessage("Unable to post Roadm-connection for node " + nodeId, forkJoinPool, results); @@ -256,7 +295,7 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { forkJoinPool.shutdown(); if (success.get()) { - results.add("Roadm-connection successfully created for nodes: " + String.join(", ", nodesProvisioned)); + results.add("Interfaces created successfully for nodes: " + String.join(", ", nodesProvisioned)); } // setting topology in the service list data store try { @@ -265,7 +304,7 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { LOG.warn("Failed to write topologies for service {}.", input.getServiceName(), e); } if (!alarmSuppressionNodeRemoval(input.getServiceName())) { - LOG.error("Alarm suppresion node removal failed!!!!"); + LOG.error("Alarm suppression node removal failed!!!!"); } return new ServicePathOutputBuilder() .setNodeInterface(nodeInterfaces) @@ -290,7 +329,7 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { @Override public ServicePathOutput deleteServicePath(ServicePathInput input) { if (!alarmSuppressionNodeRegistration(input)) { - LOG.warn("Alarm suppresion node registraion failed!!!!"); + LOG.warn("Alarm suppression node registration failed!!!!"); } List nodes = input.getNodes(); AtomicBoolean success = new AtomicBoolean(true); @@ -364,6 +403,7 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { String spectralSlotName = String.join(GridConstant.SPECTRAL_SLOT_SEPARATOR, String.valueOf(lowerSpectralSlotNumber), String.valueOf(higherSpectralSlotNumber)); + if (destTp.contains(StringConstants.NETWORK_TOKEN) || srcTp.contains(StringConstants.CLIENT_TOKEN) || srcTp.contains(StringConstants.NETWORK_TOKEN) @@ -387,12 +427,19 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { OpenroadmNodeVersion nodeOpenRoadmVersion = this.portMapping.getNode(nodeId).getNodeInfo().getOpenroadmVersion(); + List interfacesToDelete = new LinkedList<>(); Map> suffixListMap = nodeOpenRoadmVersion.equals(OpenroadmNodeVersion._71) ? Map.of( - "ODU", List.of("ODUC4","ODUFLEX"), - "other", List.of("OTUC4", "OTSI-GROUP", spectralSlotName)) + // We don't need ODUC2, ODUC3 here, since they are handled in OTN service-path + // This has to be in an order of deletion + "ODU", List.of("ODU4", "ODUFLEX", "ODUC4", "ODUC1"), + // Add intermediate OTUCn rates (OTUC2, OTUC3) + // OTU4 is used in 100G service on 7.1 model + "other", List.of("OTU4", "OTUC1", "OTUC2", "OTUC3", "OTUC4", + "OTSIGROUP-400G", "OTSIGROUP-300G", "OTSIGROUP-200G", "OTSIGROUP-100G", + spectralSlotName)) : Map.of( "ODU", List.of("ODU", "ODU4"), "other", List.of("OTU", spectralSlotName)); @@ -401,31 +448,11 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { // common GridConstant that states NAME_PARAMETERS_SEPARATOR = "-" if (destTp.contains(StringConstants.NETWORK_TOKEN)) { - try { - for (String suffix : suffixListMap.get("ODU")) { - if (this.openRoadmInterfaces.getInterface( - nodeId, String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, destTp, suffix)).isPresent()) { - interfacesToDelete.add(String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, destTp, suffix)); - } - } - } - catch (OpenRoadmInterfaceException e) { - LOG.error("impossible to get one of the interfaces {}", - destTp + GridConstant.NAME_PARAMETERS_SEPARATOR + String.join( - " or " + destTp + GridConstant.NAME_PARAMETERS_SEPARATOR, - suffixListMap.get("ODU")), - e); - } - for (String suffix : suffixListMap.get("other")) { - interfacesToDelete.add(String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, destTp, suffix)); - } + interfacesToDelete.addAll(inf2Del(destTp, suffixListMap, nodeId)); } if (srcTp.contains(StringConstants.NETWORK_TOKEN)) { - interfacesToDelete.add( - String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, srcTp, suffixListMap.get("ODU").get(0))); - for (String suffix : suffixListMap.get("other")) { - interfacesToDelete.add(String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, srcTp, suffix)); - } + // For a regen case, the srcTp can also contain the network-token + interfacesToDelete.addAll(inf2Del(srcTp, suffixListMap, nodeId)); } if (srcTp.contains(StringConstants.CLIENT_TOKEN)) { interfacesToDelete.add(String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, srcTp, "ETHERNET")); @@ -436,6 +463,42 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { return interfacesToDelete; } + private List inf2Del(String termPoint, Map> suffixListMap, String nodeId) { + List inf2Del = new LinkedList<>(); + try { + for (String suffix : suffixListMap.get("ODU")) { + if (this.openRoadmInterfaces.getInterface( + nodeId, String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, termPoint, suffix)).isPresent()) { + inf2Del.add(String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, termPoint, suffix)); + } + } + } + catch (OpenRoadmInterfaceException e) { + LOG.error("impossible to get one of the interfaces {}", + termPoint + GridConstant.NAME_PARAMETERS_SEPARATOR + String.join( + " or " + termPoint + GridConstant.NAME_PARAMETERS_SEPARATOR, + suffixListMap.get("ODU")), + e); + } + try { + for (String suffix : suffixListMap.get("other")) { + if (this.openRoadmInterfaces.getInterface( + nodeId, String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, termPoint, suffix)).isPresent()) { + LOG.info("Deleting the interface {}", + String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, termPoint, suffix)); + inf2Del.add(String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, termPoint, suffix)); + } + } + } + catch (OpenRoadmInterfaceException e) { + LOG.error("impossible to get one of the interfaces {}", + termPoint + GridConstant.NAME_PARAMETERS_SEPARATOR + String.join( + " or " + termPoint + GridConstant.NAME_PARAMETERS_SEPARATOR, + suffixListMap.get("ODU")), + e); + } + return inf2Del; + } @Override @@ -443,7 +506,7 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { boolean success = true; Map failedToRollbackList = new HashMap<>(); for (NodeInterface nodeInterfaces : input.nonnullNodeInterface().values()) { - List failedInterfaces = new ArrayList<>(); + Set failedInterfaces = new HashSet<>(); String nodeId = nodeInterfaces.getNodeId(); for (String connectionId : nodeInterfaces.getConnectionId()) { List listInter = this.crossConnect.deleteCrossConnect(nodeId, connectionId, false); @@ -569,7 +632,7 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { } if (services.isPresent()) { LOG.info("service {} already exists", name); - servicesBuilder = new ServicesBuilder(services.get()).setTopology(topo); + servicesBuilder = new ServicesBuilder(services.orElseThrow()).setTopology(topo); WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction(); writeTx.merge(LogicalDatastoreType.OPERATIONAL, iid, servicesBuilder.build()); writeTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS); @@ -578,7 +641,7 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { } } - @edu.umd.cs.findbugs.annotations.SuppressFBWarnings( + @SuppressFBWarnings( value = "SLF4J_FORMAT_SHOULD_BE_CONST", justification = "Log messages content needs to be formatted before" + "since they are used in the returned object")