import com.google.common.util.concurrent.FluentFuture;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Optional;
import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.NetworkBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.NodesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.CpToDegree;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.CpToDegreeBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.CpToDegreeKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.MappingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.MappingKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.NodeInfo;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.NodeInfo.OpenroadmVersion;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.NodeInfoBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.NetworkBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.NodesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.CpToDegree;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.CpToDegreeBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.CpToDegreeKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.McCapabilities;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.McCapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.McCapabilitiesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.NodeInfo;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.NodeInfo.OpenroadmVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.NodeInfoBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.SwitchingPoolLcp;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.SwitchingPoolLcpBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.SwitchingPoolLcpKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.switching.pool.lcp.NonBlockingList;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.switching.pool.lcp.NonBlockingListBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.switching.pool.lcp.NonBlockingListKey;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.optical.channel.types.rev200529.FrequencyGHz;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.Direction;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.Port;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.PortQual;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.XpdrNodeTypes;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.CircuitPack;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.circuit.pack.Ports;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.circuit.pack.PortsKey;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.Degree;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.DegreeKey;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.Info;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.OduSwitchingPools;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.Protocols;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.SharedRiskGroup;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.SharedRiskGroupKey;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.Xponder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.connection.map.Destination;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.odu.switching.pools.non.blocking.list.PortList;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.port.Interfaces;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.xponder.XpdrPort;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes;
import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.InterfaceType;
import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.OpenROADMOpticalMultiplex;
import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.OpticalTransport;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev170626.OtnOdu;
import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.Protocols1;
import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.lldp.container.Lldp;
import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev181019.lldp.container.lldp.PortConfig;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181019.SupportedIfCapability;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.switching.pool.types.rev191129.SwitchingPoolTypes;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+// FIXME: many common pieces of code between PortMapping Versions 121 and 221 and 710
+// some mutualization would be helpful
public class PortMappingVersion221 {
- private static final Logger LOG = LoggerFactory.getLogger(PortMappingImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PortMappingVersion221.class);
+ private static final Map<Direction, String> SUFFIX;
private final DataBroker dataBroker;
private final DeviceTransactionManager deviceTransactionManager;
private final OpenRoadmInterfaces openRoadmInterfaces;
+ static {
+ SUFFIX = Map.of(
+ Direction.Tx, "TX",
+ Direction.Rx, "RX",
+ Direction.Bidirectional, "TXRX");
+ }
+
public PortMappingVersion221(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager,
OpenRoadmInterfaces openRoadmInterfaces) {
this.dataBroker = dataBroker;
}
public boolean createMappingData(String nodeId) {
- LOG.info("Create Mapping Data for node 2.2.1 {}", nodeId);
+ LOG.info("{} : OpenROADM version 2.2.1 node - Creating Mapping Data", nodeId);
List<Mapping> portMapList = new ArrayList<>();
+ Map<McCapabilitiesKey, McCapabilities> mcCapabilities = new HashMap<>();
InstanceIdentifier<Info> infoIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child(Info.class);
- Optional<Info> deviceInfoOptional = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType
- .OPERATIONAL, infoIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- Info deviceInfo;
- NodeInfo nodeInfo;
- if (deviceInfoOptional.isPresent()) {
- deviceInfo = deviceInfoOptional.get();
- nodeInfo = createNodeInfo(deviceInfo);
- if (nodeInfo == null) {
- return false;
- } else {
- postPortMapping(nodeId, nodeInfo, null, null);
- }
- } else {
- LOG.warn("Device info subtree is absent for {}", nodeId);
+ Optional<Info> deviceInfoOptional = this.deviceTransactionManager.getDataFromDevice(
+ nodeId, LogicalDatastoreType.OPERATIONAL, infoIID,
+ Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
+ if (!deviceInfoOptional.isPresent()) {
+ LOG.warn("{} : Device info subtree is absent", nodeId);
+ return false;
+ }
+ Info deviceInfo = deviceInfoOptional.get();
+ NodeInfo nodeInfo = createNodeInfo(deviceInfo);
+ if (nodeInfo == null) {
return false;
}
+ postPortMapping(nodeId, nodeInfo, null, null, null, null);
switch (deviceInfo.getNodeType()) {
// Get TTP port mapping
if (!createTtpPortMapping(nodeId, deviceInfo, portMapList)) {
// return false if mapping creation for TTP's failed
- LOG.warn("Unable to create mapping for TTP's on node {}", nodeId);
+ LOG.warn("{} : Unable to create mapping for TTP's", nodeId);
return false;
}
// Get PP port mapping
if (!createPpPortMapping(nodeId, deviceInfo, portMapList)) {
// return false if mapping creation for PP's failed
- LOG.warn("Unable to create mapping for PP's on node {}", nodeId);
+ LOG.warn("{} : Unable to create mapping for PP's", nodeId);
+ return false;
+ }
+ // Get MC capabilities
+ if (!createMcCapabilitiesList(nodeId, deviceInfo, mcCapabilities)) {
+ // return false if MC capabilites failed
+ LOG.warn("{} : Unable to create MC capabilities", nodeId);
return false;
}
break;
case Xpdr:
if (!createXpdrPortMapping(nodeId, portMapList)) {
- LOG.warn("Unable to create mapping for Xponder on node {}", nodeId);
+ LOG.warn("{} : Unable to create mapping for the Xponder", nodeId);
return false;
}
break;
default:
- LOG.error("Unable to create mapping for node {} : unknown nodetype ", nodeId);
+ LOG.error("{} : unknown nodetype - Unable to create mapping", nodeId);
break;
}
- return postPortMapping(nodeId, nodeInfo, portMapList, null);
+ return postPortMapping(nodeId, nodeInfo, portMapList, null, null, mcCapabilities);
}
public boolean updateMapping(String nodeId, Mapping oldMapping) {
- LOG.info("Updating Mapping Data {} for node {}", oldMapping, nodeId);
InstanceIdentifier<Ports> portIId = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(CircuitPacks.class, new CircuitPacksKey(oldMapping.getSupportingCircuitPackName()))
.child(Ports.class, new PortsKey(oldMapping.getSupportingPort()));
- if ((oldMapping != null) && (nodeId != null)) {
- try {
- Optional<Ports> portObject = deviceTransactionManager.getDataFromDevice(nodeId,
- LogicalDatastoreType.OPERATIONAL, portIId, Timeouts.DEVICE_READ_TIMEOUT,
- Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- if (portObject.isPresent()) {
- Ports port = portObject.get();
- Mapping newMapping = createMappingObject(nodeId, port, oldMapping.getSupportingCircuitPackName(),
- oldMapping.getLogicalConnectionPoint());
-
- final WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction();
- InstanceIdentifier<Mapping> mapIID = InstanceIdentifier.create(Network.class)
- .child(Nodes.class, new NodesKey(nodeId))
- .child(Mapping.class, new MappingKey(oldMapping.getLogicalConnectionPoint()));
- writeTransaction.merge(LogicalDatastoreType.CONFIGURATION, mapIID, newMapping);
- FluentFuture<? extends @NonNull CommitInfo> commit = writeTransaction.commit();
- commit.get();
- return true;
- }
- return false;
- } catch (InterruptedException | ExecutionException e) {
- LOG.error("Error updating Mapping {} for node {}", oldMapping.getLogicalConnectionPoint(), nodeId, e);
+ if ((oldMapping == null) || (nodeId == null)) {
+ LOG.error("Impossible to update mapping");
+ return false;
+ }
+ try {
+ Optional<Ports> portObject = deviceTransactionManager.getDataFromDevice(nodeId,
+ LogicalDatastoreType.OPERATIONAL, portIId, Timeouts.DEVICE_READ_TIMEOUT,
+ Timeouts.DEVICE_READ_TIMEOUT_UNIT);
+ if (!portObject.isPresent()) {
return false;
}
- } else {
- LOG.error("Impossible to update mapping");
+ Ports port = portObject.get();
+ Mapping newMapping = createMappingObject(nodeId, port, oldMapping.getSupportingCircuitPackName(),
+ oldMapping.getLogicalConnectionPoint());
+ LOG.debug("{} : Updating old mapping Data {} for {} by new mapping data {}",
+ nodeId, oldMapping, oldMapping.getLogicalConnectionPoint(), newMapping);
+ final WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction();
+ InstanceIdentifier<Mapping> mapIID = InstanceIdentifier.create(Network.class)
+ .child(Nodes.class, new NodesKey(nodeId))
+ .child(Mapping.class, new MappingKey(oldMapping.getLogicalConnectionPoint()));
+ writeTransaction.merge(LogicalDatastoreType.CONFIGURATION, mapIID, newMapping);
+ FluentFuture<? extends @NonNull CommitInfo> commit = writeTransaction.commit();
+ commit.get();
+ return true;
+ } catch (InterruptedException | ExecutionException e) {
+ LOG.error("{} : exception when updating Mapping {} - ",
+ nodeId, oldMapping.getLogicalConnectionPoint(), e);
return false;
}
}
Optional<OrgOpenroadmDevice> deviceObject = deviceTransactionManager.getDataFromDevice(nodeId,
LogicalDatastoreType.OPERATIONAL, deviceIID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
-
- // Variable to keep track of number of line ports
- int line = 1;
- // Variable to keep track of number of client ports
- int client = 1;
- if (!deviceObject.isPresent() || deviceObject.get().getCircuitPacks() == null) {
- LOG.warn("Circuit Packs are not present for {}", nodeId);
+ if (!deviceObject.isPresent()) {
+ LOG.error("{} : Impossible to get device configuration", nodeId);
+ return false;
+ }
+ OrgOpenroadmDevice device = deviceObject.get();
+ if (device.getCircuitPacks() == null) {
+ LOG.warn("{} : Circuit Packs not present", nodeId);
return false;
- // TODO return false or continue?
}
+
Map<String, String> lcpMap = new HashMap<>();
Map<String, Mapping> mappingMap = new HashMap<>();
-
- List<CircuitPacks> circuitPackList = deviceObject.get().getCircuitPacks();
+ List<CircuitPacks> circuitPackList = new ArrayList<>(device.nonnullCircuitPacks().values());
circuitPackList.sort(Comparator.comparing(CircuitPack::getCircuitPackName));
-
- for (CircuitPacks cp : circuitPackList) {
- String circuitPackName = cp.getCircuitPackName();
- if (cp.getPorts() == null) {
- LOG.warn("Ports were not found for circuit pack: {}", circuitPackName);
- continue;
- }
- List<Ports> portList = cp.getPorts();
- portList.sort(Comparator.comparing(Ports::getPortName));
- for (Ports port : portList) {
- if (port.getPortQual() == null) {
- LOG.warn("PortQual was not found for port {} on circuit pack: {}", port.getPortName(),
- circuitPackName);
+ if (device.getXponder() == null) {
+ LOG.warn("{} : configuration does not contain a list of Xponders", nodeId);
+ // Variables to keep track of number of line ports and client ports
+ int line = 1;
+ int client = 1;
+ // TODO the treatment here inside the 2 nested for-loop is very similar to the one
+ // when device.getXponder() != null. Some code mutualization must be considered.
+ for (CircuitPacks cp : circuitPackList) {
+ String circuitPackName = cp.getCircuitPackName();
+ if (cp.getPorts() == null) {
+ LOG.warn("{} : Ports were not found for circuit pack {}", nodeId, circuitPackName);
continue;
}
- if (Port.PortQual.XpdrNetwork.getIntValue() == port.getPortQual().getIntValue()
- && port.getPortDirection().getIntValue() == Direction.Bidirectional.getIntValue()) {
- String lcp = "XPDR1-" + StringConstants.NETWORK_TOKEN + line;
- lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp);
- mappingMap.put(lcp, createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, null));
- line++;
- } else if (Port.PortQual.XpdrNetwork.getIntValue() == port.getPortQual().getIntValue()
- && port.getPortDirection().getIntValue() != Direction.Bidirectional.getIntValue()
- && port.getPartnerPort() != null
- && port.getPartnerPort().getCircuitPackName() != null
- && port.getPartnerPort().getPortName() != null) {
- if (lcpMap.containsKey(circuitPackName + '+' + port.getPortName())) {
+ List<Ports> portList = new ArrayList<>(cp.nonnullPorts().values());
+ portList.sort(Comparator.comparing(Ports::getPortName));
+ for (Ports port : portList) {
+ int[] counters = fillXpdrLcpsMaps(line, client, nodeId,
+ 1, null, circuitPackName, port,
+ circuitPackList, lcpMap, mappingMap);
+ line = counters[0];
+ client = counters[1];
+ }
+ }
+ } else {
+ LOG.info("{} : configuration contains a list of xponders", nodeId);
+ for (Xponder xponder : deviceObject.get().nonnullXponder().values()) {
+ // Variables to keep track of number of line ports and client ports
+ int line = 1;
+ int client = 1;
+ Integer xponderNb = xponder.getXpdrNumber().toJava();
+ XpdrNodeTypes xponderType = xponder.getXpdrType();
+ for (XpdrPort xpdrPort : xponder.nonnullXpdrPort().values()) {
+ String circuitPackName = xpdrPort.getCircuitPackName();
+ String portName = xpdrPort.getPortName().toString();
+ // If there xponder-subtree has missing circuit-packs or ports,
+ // This gives a null-pointer expection,
+ if (device.nonnullCircuitPacks().values().stream()
+ .filter(cp -> cp.getCircuitPackName().equals(circuitPackName))
+ .findFirst().isEmpty()) {
+ LOG.warn("{} : Circuit-pack {} is missing in the device - ignoring it in port-mapping",
+ nodeId, circuitPackName);
continue;
}
- String lcp1 = "XPDR1-" + StringConstants.NETWORK_TOKEN + line;
- Optional<CircuitPacks> cpOpt = circuitPackList.stream().filter(cP -> cP.getCircuitPackName()
- .equals(port.getPartnerPort().getCircuitPackName())).findFirst();
- if (cpOpt.isPresent()) {
- Optional<Ports> poOpt = cpOpt.get().getPorts().stream().filter(p -> p.getPortName().equals(port
- .getPartnerPort().getPortName().toString())).findFirst();
- if (poOpt.isPresent()) {
- Ports port2 = poOpt.get();
- if ((Direction.Rx.getIntValue() == port.getPortDirection().getIntValue()
- && Direction.Tx.getIntValue() == port2.getPortDirection().getIntValue()
- && port2.getPartnerPort() != null && port2.getPartnerPort().getCircuitPackName() != null
- && port2.getPartnerPort().getPortName() != null
- && port2.getPartnerPort().getCircuitPackName().equals(circuitPackName)
- && port2.getPartnerPort().getPortName().equals(port.getPortName()))
- ||
- (Direction.Tx.getIntValue() == port.getPortDirection().getIntValue()
- && Direction.Rx.getIntValue() == port2.getPortDirection().getIntValue()
- && port2.getPartnerPort() != null && port2.getPartnerPort().getCircuitPackName() != null
- && port2.getPartnerPort().getPortName() != null
- && port2.getPartnerPort().getCircuitPackName().equals(circuitPackName)
- && port2.getPartnerPort().getPortName().equals(port.getPortName()))) {
- String lcp2 = new StringBuilder("XPDR1-").append(StringConstants.NETWORK_TOKEN)
- .append(line + 1).toString();
- if (!lcpMap.containsKey(lcp1) && !lcpMap.containsKey(lcp2)) {
- lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1);
- lcpMap.put(cpOpt.get().getCircuitPackName() + '+' + port2.getPortName(), lcp2);
- mappingMap.put(lcp1, createXpdrMappingObject(nodeId, port, circuitPackName, lcp1,
- lcp2, null, null));
- mappingMap.put(lcp2, createXpdrMappingObject(nodeId, port2, cpOpt.get()
- .getCircuitPackName(), lcp2, lcp1, null, null));
- } else {
- LOG.warn("mapping already exists for {} or {}", lcp1, lcp2);
- }
- line += 2;
- } else {
- LOG.error("port {} on {} is not a correct partner port of {} on {}",
- port2.getPortName(), cpOpt.get().getCircuitPackName(), port.getPortName(),
- circuitPackName);
- }
- } else {
- LOG.error("Error fetching port {} on {} for {}", port.getPartnerPort().getPortName(),
- port.getPartnerPort().getCircuitPackName(), nodeId);
- }
- } else {
- LOG.error("Error fetching circuit-pack {} for {}", port.getPartnerPort().getCircuitPackName(),
- nodeId);
+ if (device.nonnullCircuitPacks().values().stream()
+ .filter(cp -> cp.getCircuitPackName().equals(circuitPackName))
+ .findFirst().get().nonnullPorts().values().stream()
+ .filter(p -> p.getPortName().equals(portName))
+ .findFirst().isEmpty()) {
+ LOG.warn("{} : port {} on {} - association missing in the device - ignoring it in port-mapping",
+ nodeId, portName, circuitPackName);
+ continue;
}
- } else if (Port.PortQual.XpdrClient.getIntValue() == port.getPortQual().getIntValue()) {
- String lcp = "XPDR1-" + StringConstants.CLIENT_TOKEN + client;
- lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp);
- mappingMap.put(lcp, createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, null));
- client++;
- } else {
- LOG.warn("Error in the configuration of port {} of {} for {}", port.getPortName(), circuitPackName,
- nodeId);
+ Ports port = device.nonnullCircuitPacks().values().stream()
+ .filter(cp -> cp.getCircuitPackName().equals(circuitPackName))
+ .findFirst().get().nonnullPorts().values().stream()
+ .filter(p -> p.getPortName().equals(portName))
+ .findFirst().get();
+ int[] counters = fillXpdrLcpsMaps(line, client, nodeId,
+ xponderNb, xponderType, circuitPackName, port,
+ circuitPackList, lcpMap, mappingMap);
+ line = counters[0];
+ client = counters[1];
}
}
}
- List<ConnectionMap> connectionMap = deviceObject.get().getConnectionMap();
- String slcp = null;
- String dlcp = null;
- for (ConnectionMap cm : connectionMap) {
- String skey = cm.getSource().getCircuitPackName() + "+" + cm.getSource().getPortName();
- if (lcpMap.containsKey(skey)) {
- slcp = lcpMap.get(skey);
- }
- String dkey = cm.getDestination().get(0).getCircuitPackName() + "+"
- + cm.getDestination().get(0).getPortName();
- if (lcpMap.containsKey(dkey)) {
- dlcp = lcpMap.get(dkey);
- }
- if (slcp != null) {
+
+ if (device.getConnectionMap() == null) {
+ LOG.warn("{} : No connection-map inside device configuration", nodeId);
+ } else {
+ Collection<ConnectionMap> connectionMap = deviceObject.get().nonnullConnectionMap().values();
+ for (ConnectionMap cm : connectionMap) {
+ String skey = cm.getSource().getCircuitPackName() + "+" + cm.getSource().getPortName();
+ String slcp = lcpMap.containsKey(skey) ? lcpMap.get(skey) : null;
+ Destination destination0 = cm.nonnullDestination().values().iterator().next();
+ String dkey = destination0.getCircuitPackName() + "+" + destination0.getPortName();
+ if (slcp == null) {
+ LOG.error("{} : Error in connection-map analysis for source {} and destination (CP+port) {}",
+ nodeId, skey, dkey);
+ continue;
+ }
+ String dlcp = lcpMap.containsKey(dkey) ? lcpMap.get(dkey) : null;
Mapping mapping = mappingMap.get(slcp);
mappingMap.remove(slcp);
- portMapList.add(createXpdrMappingObject(nodeId, null, null, null, null, mapping, dlcp));
- } else {
- LOG.error("Error in connection-map analysis");
+ portMapList.add(createXpdrMappingObject(nodeId, null, null, null, null, mapping, dlcp, null));
}
}
- if (!mappingMap.isEmpty()) {
- for (Mapping m : mappingMap.values()) {
- portMapList.add(m);
+
+ if (device.getOduSwitchingPools() != null) {
+ Collection<OduSwitchingPools> oduSwithcingPools = device.nonnullOduSwitchingPools().values();
+ List<SwitchingPoolLcp> switchingPoolList = new ArrayList<>();
+ for (OduSwitchingPools odp : oduSwithcingPools) {
+ Map<NonBlockingListKey,NonBlockingList> nbMap = new HashMap<>();
+ for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org
+ .openroadm.device.odu.switching.pools.NonBlockingList nbl : odp.nonnullNonBlockingList().values()) {
+ if (nbl.getPortList() == null) {
+ continue;
+ }
+ List<String> lcpList = new ArrayList<>();
+ for (PortList item : nbl.nonnullPortList().values()) {
+ String key = item.getCircuitPackName() + "+" + item.getPortName();
+ if (!lcpMap.containsKey(key)) {
+ LOG.error("{} : port {} on {} is not associated to a logical connection point",
+ nodeId, item.getPortName(), item.getCircuitPackName());
+ continue;
+ }
+ lcpList.add(lcpMap.get(key));
+ }
+ NonBlockingList nonBlockingList = new NonBlockingListBuilder()
+ .setNblNumber(nbl.getNblNumber())
+ .setInterconnectBandwidth(nbl.getInterconnectBandwidth())
+ .setInterconnectBandwidthUnit(nbl.getInterconnectBandwidthUnit())
+ .setLcpList(lcpList)
+ .build();
+ nbMap.put(nonBlockingList.key(), nonBlockingList);
+ }
+ SwitchingPoolLcp splBldr = new SwitchingPoolLcpBuilder()
+ .setSwitchingPoolNumber(odp.getSwitchingPoolNumber())
+ .setSwitchingPoolType(SwitchingPoolTypes.forValue(odp.getSwitchingPoolType().getIntValue()))
+ .setNonBlockingList(nbMap)
+ .build();
+ switchingPoolList.add(splBldr);
}
+ postPortMapping(nodeId, null, null, null, switchingPoolList, null);
+ }
+
+ if (!mappingMap.isEmpty()) {
+ mappingMap.forEach((k,v) -> portMapList.add(v));
+ }
+ return true;
+ }
+
+ private boolean checkPartnerPortNotNull(Ports port) {
+ if (port.getPartnerPort() == null
+ || port.getPartnerPort().getCircuitPackName() == null
+ || port.getPartnerPort().getPortName() == null) {
+ return false;
+ }
+ return true;
+ }
+
+ private boolean checkPartnerPortNoDir(String circuitPackName, Ports port1, Ports port2) {
+ if (!checkPartnerPortNotNull(port2)
+ || !port2.getPartnerPort().getCircuitPackName().equals(circuitPackName)
+ || !port2.getPartnerPort().getPortName().equals(port1.getPortName())) {
+ return false;
}
return true;
}
+ private boolean checkPartnerPort(String circuitPackName, Ports port1, Ports port2) {
+ if (!checkPartnerPortNoDir(circuitPackName, port1, port2)
+ || ((Direction.Rx.getIntValue() != port1.getPortDirection().getIntValue()
+ || Direction.Tx.getIntValue() != port2.getPortDirection().getIntValue())
+ &&
+ (Direction.Tx.getIntValue() != port1.getPortDirection().getIntValue()
+ || Direction.Rx.getIntValue() != port2.getPortDirection().getIntValue()))) {
+ return false;
+ }
+ return true;
+ }
+
+
private HashMap<Integer, List<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.srg
- .CircuitPacks>> getSrgCps(String deviceId, Info ordmInfo) {
+ .CircuitPacks>> getSrgCps(String deviceId, Info ordmInfo) {
HashMap<Integer, List<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.srg
.CircuitPacks>> cpPerSrg = new HashMap<>();
- Integer maxSrg;
// Get value for max Srg from info subtree, required for iteration
// if not present assume to be 20 (temporary)
- if (ordmInfo.getMaxSrgs() != null) {
- maxSrg = ordmInfo.getMaxSrgs();
- } else {
- maxSrg = 20;
- }
+ Integer maxSrg = ordmInfo.getMaxSrgs() == null ? 20 : ordmInfo.getMaxSrgs().toJava();
for (int srgCounter = 1; srgCounter <= maxSrg; srgCounter++) {
List<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.srg.CircuitPacks> srgCps
= new ArrayList<>();
- LOG.info("Getting Circuitpacks for Srg Number {}", srgCounter);
+ LOG.debug("{} : Getting Circuitpacks for Srg Number {}", deviceId, srgCounter);
InstanceIdentifier<SharedRiskGroup> srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(SharedRiskGroup.class, new SharedRiskGroupKey(srgCounter));
+ .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(srgCounter)));
Optional<SharedRiskGroup> ordmSrgObject = this.deviceTransactionManager.getDataFromDevice(deviceId,
LogicalDatastoreType.OPERATIONAL, srgIID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
if (ordmSrgObject.isPresent()) {
- srgCps.addAll(ordmSrgObject.get().getCircuitPacks());
- cpPerSrg.put(ordmSrgObject.get().getSrgNumber(), srgCps);
+ srgCps.addAll(ordmSrgObject.get().nonnullCircuitPacks().values());
+ cpPerSrg.put(ordmSrgObject.get().getSrgNumber().toJava(), srgCps);
}
}
- LOG.info("Device {} has {} Srg", deviceId, cpPerSrg.size());
+ LOG.info("{} : Device has {} Srg", deviceId, cpPerSrg.size());
return cpPerSrg;
}
- //last LOG info message in this method is too long
- @SuppressWarnings("checkstyle:linelength")
private boolean createPpPortMapping(String nodeId, Info deviceInfo, List<Mapping> portMapList) {
// Creating mapping data for SRG's PP
HashMap<Integer, List<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.srg.CircuitPacks>> srgCps
= getSrgCps(nodeId, deviceInfo);
-
- for (Integer k : srgCps.keySet()) {
+ for (Entry<Integer, List<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.srg.CircuitPacks>>
+ srgCpEntry : srgCps.entrySet()) {
List<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.srg.CircuitPacks> cpList =
- srgCps.get(k);
+ srgCps.get(srgCpEntry.getKey());
List<String> keys = new ArrayList<>();
for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.srg.CircuitPacks cp : cpList) {
String circuitPackName = cp.getCircuitPackName();
LOG.warn("{} : Circuit pack {} not found or without ports.", nodeId, circuitPackName);
continue;
}
- List<Ports> portList = circuitPackObject.get().getPorts();
+ List<Ports> portList = new ArrayList<>(circuitPackObject.get().nonnullPorts().values());
Collections.sort(portList, new SortPort221ByName());
int portIndex = 1;
for (Ports port : portList) {
String currentKey = circuitPackName + "-" + port.getPortName();
if (port.getPortQual() == null) {
continue;
- } else if (Port.PortQual.RoadmExternal.getIntValue() == port.getPortQual().getIntValue()
- && Direction.Bidirectional.getIntValue() == port.getPortDirection().getIntValue()
- && !keys.contains(currentKey)) {
- String logicalConnectionPoint = createLogicalConnectionPort(port, k, portIndex);
- LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, circuitPackName,
- port.getPortName(), logicalConnectionPoint);
- portMapList.add(createMappingObject(nodeId, port, circuitPackName, logicalConnectionPoint));
- portIndex++;
- keys.add(currentKey);
- } else if (Port.PortQual.RoadmExternal.getIntValue() == port.getPortQual().getIntValue()
- && (Direction.Rx.getIntValue() == port.getPortDirection().getIntValue()
- || Direction.Tx.getIntValue() == port.getPortDirection().getIntValue())
- && !keys.contains(currentKey)
- && port.getPartnerPort() != null) {
- String logicalConnectionPoint1 = createLogicalConnectionPort(port, k, portIndex);
- LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, circuitPackName,
- port.getPortName(), logicalConnectionPoint1);
- InstanceIdentifier<Ports> port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(CircuitPacks.class, new CircuitPacksKey(port.getPartnerPort().getCircuitPackName()))
- .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName().toString()));
- Optional<Ports> port2Object = this.deviceTransactionManager.getDataFromDevice(nodeId,
- LogicalDatastoreType.OPERATIONAL, port2ID,
- Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- if (port2Object.isPresent()
- && port2Object.get().getPortQual().getIntValue()
- == Port.PortQual.RoadmExternal.getIntValue()) {
+ }
+
+ if (PortQual.RoadmExternal.getIntValue() != port.getPortQual().getIntValue()) {
+ LOG.debug("{} : port {} on {} is not roadm-external - cannot assign logicalConnectionPoint.",
+ nodeId, port.getPortName(), circuitPackName);
+ continue;
+ }
+
+ if (keys.contains(currentKey)) {
+ LOG.debug("{} : port {} on {} has already been handled - cannot assign logicalConnectionPoint.",
+ nodeId, port.getPortName(), circuitPackName);
+ continue;
+ }
+
+ switch (port.getPortDirection()) {
+
+ case Bidirectional:
+ String lcp = createLogicalConnectionPort(port, srgCpEntry.getKey(), portIndex);
+ LOG.info("{} : port {} on {} - associated Logical Connection Point is {}",
+ nodeId, port.getPortName(), circuitPackName, lcp);
+ portMapList.add(createMappingObject(nodeId, port, circuitPackName, lcp));
+ portIndex++;
+ keys.add(currentKey);
+ break;
+
+ case Rx:
+ case Tx:
+ if (!checkPartnerPortNotNull(port)) {
+ LOG.info("{} : port {} on {} is unidirectional but has no valid partnerPort"
+ + " - cannot assign logicalConnectionPoint.",
+ nodeId, port.getPortName(), circuitPackName);
+ continue;
+ }
+
+ String lcp1 = createLogicalConnectionPort(port, srgCpEntry.getKey(), portIndex);
+ LOG.info("{} : port {} on {} - associated Logical Connection Point is {}",
+ nodeId, port.getPortName(), circuitPackName, lcp1);
+ InstanceIdentifier<Ports> port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
+ .child(CircuitPacks.class,
+ new CircuitPacksKey(port.getPartnerPort().getCircuitPackName()))
+ .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName().toString()));
+ Optional<Ports> port2Object = this.deviceTransactionManager
+ .getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, port2ID,
+ Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
+ if (!port2Object.isPresent()
+ || port2Object.get().getPortQual().getIntValue()
+ != PortQual.RoadmExternal.getIntValue()) {
+ LOG.error("{} : port {} on {} - error getting partner",
+ nodeId, port.getPartnerPort().getPortName().toString(),
+ port.getPartnerPort().getCircuitPackName());
+ continue;
+ }
+
Ports port2 = port2Object.get();
- if ((port.getPortDirection().getIntValue() == Direction.Rx.getIntValue()
- && port2.getPortDirection().getIntValue() == Direction.Tx.getIntValue()
- && port2.getPartnerPort() != null
- && port2.getPartnerPort().getCircuitPackName().equals(circuitPackName)
- && port2.getPartnerPort().getPortName().toString().equals(port.getPortName()))
- ||
- (port.getPortDirection().getIntValue() == Direction.Tx.getIntValue()
- && port2.getPortDirection().getIntValue() == Direction.Rx.getIntValue()
- && port2.getPartnerPort() != null
- && port2.getPartnerPort().getCircuitPackName().equals(circuitPackName)
- && port2.getPartnerPort().getPortName().toString().equals(port.getPortName()))) {
- String logicalConnectionPoint2 = createLogicalConnectionPort(port2, k, portIndex);
- LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, circuitPackName,
- port2.getPortName(), logicalConnectionPoint2);
- portMapList.add(createMappingObject(nodeId, port, circuitPackName,
- logicalConnectionPoint1));
- portMapList.add(createMappingObject(nodeId,port2,
- port.getPartnerPort().getCircuitPackName(), logicalConnectionPoint2));
- portIndex++;
- keys.add(currentKey);
- keys.add(port.getPartnerPort().getCircuitPackName() + "-" + port2.getPortName());
- } else {
- LOG.error("Error with partner port configuration for port {} of {} - {}",
- port.getPortName(), circuitPackName, nodeId);
+ if (!checkPartnerPort(circuitPackName, port, port2)) {
+ LOG.error("{} : port {} on {} - Error with partner port configuration",
+ nodeId, port.getPortName(), circuitPackName);
portIndex++;
+ continue;
}
- } else {
- LOG.error("error getting partner port {} of {} - {}", port.getPartnerPort().getPortName()
- .toString(), port.getPartnerPort().getCircuitPackName(), nodeId);
- continue;
- }
- } else {
- LOG.info("{} : port {} on {} is not roadm-external or has already been handled. No logicalConnectionPoint assignment for this port.",
- nodeId, port.getPortName(), circuitPackName);
+ String lcp2 = createLogicalConnectionPort(port2, srgCpEntry.getKey(),portIndex);
+ LOG.info("{} : port {} on {} - associated Logical Connection Point is {}",
+ nodeId, port2.getPortName(), circuitPackName, lcp2);
+ portMapList.add(createMappingObject(nodeId, port, circuitPackName, lcp1));
+ portMapList.add(
+ createMappingObject(nodeId ,port2, port.getPartnerPort().getCircuitPackName(), lcp2));
+ portIndex++;
+ keys.add(currentKey);
+ keys.add(port.getPartnerPort().getCircuitPackName() + "-" + port2.getPortName());
+ break;
+
+ default:
+ LOG.error("{} : port {} on {} - unsupported Direction {}"
+ + " - cannot assign logicalConnectionPoint.",
+ nodeId, port.getPortName(), circuitPackName, port.getPortDirection());
+
}
}
}
}
private String createLogicalConnectionPort(Ports port, int index, int portIndex) {
- String lcp = null;
- switch (port.getPortDirection()) {
- case Tx:
- lcp = "SRG" + index + "-PP" + portIndex + "-TX";
- break;
- case Rx:
- lcp = "SRG" + index + "-PP" + portIndex + "-RX";
- break;
- case Bidirectional:
- lcp = "SRG" + index + "-PP" + portIndex + "-TXRX";
- break;
- default:
- LOG.error("Unsupported port direction for port {} : {}", port, port.getPortDirection());
+ if (SUFFIX.containsKey(port.getPortDirection())) {
+ return String.join("-", "SRG" + index, "PP" + portIndex, SUFFIX.get(port.getPortDirection()));
}
- return lcp;
+ LOG.error("port {} : Unsupported port direction {}", port, port.getPortDirection());
+ return null;
+ }
+
+ private String createXpdrLogicalConnectionPort(int xponderNb, int lcpNb, String token) {
+ return new StringBuilder("XPDR").append(xponderNb)
+ .append("-")
+ .append(token).append(lcpNb)
+ .toString();
}
- private List<Degree> getDegrees(String deviceId, Info ordmInfo) {
- List<Degree> degrees = new ArrayList<>();
- Integer maxDegree;
+
+ private Map<Integer, Degree> getDegreesMap(String deviceId, Info ordmInfo) {
+ Map<Integer, Degree> degrees = new HashMap<>();
// Get value for max degree from info subtree, required for iteration
// if not present assume to be 20 (temporary)
- if (ordmInfo.getMaxDegrees() != null) {
- maxDegree = ordmInfo.getMaxDegrees();
- } else {
- maxDegree = 20;
- }
+ Integer maxDegree = ordmInfo.getMaxDegrees() == null ? 20 : ordmInfo.getMaxDegrees().toJava();
for (int degreeCounter = 1; degreeCounter <= maxDegree; degreeCounter++) {
- LOG.info("Getting Connection ports for Degree Number {}", degreeCounter);
+ LOG.debug("{} : Getting Connection ports for Degree Number {}", deviceId, degreeCounter);
InstanceIdentifier<Degree> deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(Degree.class, new DegreeKey(degreeCounter));
+ .child(Degree.class, new DegreeKey(Uint16.valueOf(degreeCounter)));
Optional<Degree> ordmDegreeObject = this.deviceTransactionManager.getDataFromDevice(deviceId,
LogicalDatastoreType.OPERATIONAL, deviceIID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
if (ordmDegreeObject.isPresent()) {
- degrees.add(ordmDegreeObject.get());
+ degrees.put(degreeCounter, ordmDegreeObject.get());
}
}
- LOG.info("Device {} has {} degree", degrees.size());
+ LOG.info("{} : Device has {} degree(s)", deviceId, degrees.size());
return degrees;
}
private Map<Integer, List<ConnectionPorts>> getPerDegreePorts(String deviceId, Info ordmInfo) {
Map<Integer, List<ConnectionPorts>> conPortMap = new HashMap<>();
- Integer maxDegree;
+ getDegreesMap(deviceId, ordmInfo).forEach(
+ (index, degree) -> conPortMap.put(index, new ArrayList<>(degree.nonnullConnectionPorts().values())));
+ return conPortMap;
+ }
- if (ordmInfo.getMaxDegrees() != null) {
- maxDegree = ordmInfo.getMaxDegrees();
- } else {
- maxDegree = 20;
- }
- for (int degreeCounter = 1; degreeCounter <= maxDegree; degreeCounter++) {
- LOG.info("Getting Connection ports for Degree Number {}", degreeCounter);
- InstanceIdentifier<Degree> deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(Degree.class, new DegreeKey(degreeCounter));
- Optional<Degree> ordmDegreeObject = this.deviceTransactionManager.getDataFromDevice(deviceId,
- LogicalDatastoreType.OPERATIONAL, deviceIID,
+ private List<SharedRiskGroup> getSrgs(String deviceId, Info ordmInfo) {
+ List<SharedRiskGroup> srgs = new ArrayList<>();
+
+ // Get value for max Srg from info subtree, required for iteration
+ // if not present assume to be 20 (temporary)
+ Integer maxSrg = ordmInfo.getMaxSrgs() == null ? 20 : ordmInfo.getMaxSrgs().toJava();
+ for (int srgCounter = 1; srgCounter <= maxSrg; srgCounter++) {
+ InstanceIdentifier<SharedRiskGroup> srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
+ .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(srgCounter)));
+ Optional<SharedRiskGroup> ordmSrgObject = this.deviceTransactionManager.getDataFromDevice(deviceId,
+ LogicalDatastoreType.OPERATIONAL, srgIID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- if (ordmDegreeObject.isPresent()) {
- conPortMap.put(degreeCounter, ordmDegreeObject.get().getConnectionPorts());
+ if (ordmSrgObject.isPresent()) {
+ srgs.add(ordmSrgObject.get());
+
}
}
- LOG.info("Device {} has {} degree", deviceId, conPortMap.size());
- return conPortMap;
+ return srgs;
}
private Map<String, String> getEthInterfaceList(String nodeId) {
- LOG.info("It is calling get ethernet interface");
- Map<String, String> cpToInterfaceMap = new HashMap<>();
+ LOG.info("{} : It is calling get ethernet interface", nodeId);
InstanceIdentifier<Protocols> protocoliid = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(Protocols.class);
Optional<Protocols> protocolObject = this.deviceTransactionManager.getDataFromDevice(nodeId,
LogicalDatastoreType.OPERATIONAL, protocoliid, Timeouts.DEVICE_READ_TIMEOUT,
Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- if (protocolObject.isPresent() && protocolObject.get().augmentation(Protocols1.class).getLldp() != null) {
- Lldp lldp = protocolObject.get().augmentation(Protocols1.class).getLldp();
- for (PortConfig portConfig : lldp.getPortConfig()) {
- if (portConfig.getAdminStatus().equals(PortConfig.AdminStatus.Txandrx)) {
- InstanceIdentifier<Interface> interfaceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(Interface.class, new InterfaceKey(portConfig.getIfName()));
- Optional<Interface> interfaceObject = this.deviceTransactionManager.getDataFromDevice(nodeId,
- LogicalDatastoreType.OPERATIONAL, interfaceIID, Timeouts.DEVICE_READ_TIMEOUT,
- Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- if (interfaceObject.isPresent() && (interfaceObject.get().getSupportingCircuitPackName() != null)) {
- String supportingCircuitPackName = interfaceObject.get().getSupportingCircuitPackName();
- cpToInterfaceMap.put(supportingCircuitPackName, portConfig.getIfName());
- InstanceIdentifier<CircuitPacks> circuitPacksIID = InstanceIdentifier
- .create(OrgOpenroadmDevice.class)
- .child(CircuitPacks.class, new CircuitPacksKey(supportingCircuitPackName));
- Optional<CircuitPacks> circuitPackObject = this.deviceTransactionManager.getDataFromDevice(
- nodeId, LogicalDatastoreType.OPERATIONAL, circuitPacksIID, Timeouts.DEVICE_READ_TIMEOUT,
- Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- if (circuitPackObject.isPresent() && (circuitPackObject.get().getParentCircuitPack() != null)) {
- cpToInterfaceMap.put(circuitPackObject.get().getParentCircuitPack().getCircuitPackName(),
- portConfig.getIfName());
- }
- }
- }
+ if (!protocolObject.isPresent() || protocolObject.get().augmentation(Protocols1.class).getLldp() == null) {
+ LOG.warn("{} : Couldnt find port config under LLDP - Processiong is done.. now returning..", nodeId);
+ return new HashMap<>();
+ }
+ Map<String, String> cpToInterfaceMap = new HashMap<>();
+ Lldp lldp = protocolObject.get().augmentation(Protocols1.class).getLldp();
+ for (PortConfig portConfig : lldp.nonnullPortConfig().values()) {
+ if (!portConfig.getAdminStatus().equals(PortConfig.AdminStatus.Txandrx)) {
+ continue;
}
- } else {
- LOG.warn("Couldnt find port config under LLDP for Node : {}", nodeId);
+ InstanceIdentifier<Interface> interfaceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
+ .child(Interface.class, new InterfaceKey(portConfig.getIfName()));
+ Optional<Interface> interfaceObject = this.deviceTransactionManager.getDataFromDevice(nodeId,
+ LogicalDatastoreType.OPERATIONAL, interfaceIID, Timeouts.DEVICE_READ_TIMEOUT,
+ Timeouts.DEVICE_READ_TIMEOUT_UNIT);
+ if (!interfaceObject.isPresent() || (interfaceObject.get().getSupportingCircuitPackName() == null)) {
+ continue;
+ }
+ String supportingCircuitPackName = interfaceObject.get().getSupportingCircuitPackName();
+ cpToInterfaceMap.put(supportingCircuitPackName, portConfig.getIfName());
+ InstanceIdentifier<CircuitPacks> circuitPacksIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
+ .child(CircuitPacks.class, new CircuitPacksKey(supportingCircuitPackName));
+ Optional<CircuitPacks> circuitPackObject = this.deviceTransactionManager.getDataFromDevice(
+ nodeId, LogicalDatastoreType.OPERATIONAL, circuitPacksIID, Timeouts.DEVICE_READ_TIMEOUT,
+ Timeouts.DEVICE_READ_TIMEOUT_UNIT);
+ if (!circuitPackObject.isPresent() || (circuitPackObject.get().getParentCircuitPack() == null)) {
+ continue;
+ }
+ cpToInterfaceMap.put(circuitPackObject.get().getParentCircuitPack().getCircuitPackName(),
+ portConfig.getIfName());
}
- LOG.info("Processiong is done.. now returning..");
+ LOG.info("{} : Processiong is done.. now returning..", nodeId);
return cpToInterfaceMap;
}
- private List<CpToDegree> getCpToDegreeList(List<Degree> degrees, String nodeId,
- Map<String, String> interfaceList) {
+ private List<CpToDegree> getCpToDegreeList(Map<Integer, Degree> degrees, Map<String, String> interfaceList) {
List<CpToDegree> cpToDegreeList = new ArrayList<>();
- for (Degree degree : degrees) {
- if (degree.getCircuitPacks() != null) {
- LOG.info("Inside CP to degree list");
- cpToDegreeList.addAll(degree.getCircuitPacks().stream()
- .map(cp -> createCpToDegreeObject(cp.getCircuitPackName(),
- degree.getDegreeNumber().toString(), nodeId, interfaceList))
- .collect(Collectors.toList()));
- }
+ for (Degree degree : degrees.values()) {
+ LOG.debug("Inside CP to degree list");
+ cpToDegreeList.addAll(degree.nonnullCircuitPacks().values().stream()
+ .map(cp -> createCpToDegreeObject(cp.getCircuitPackName(),
+ degree.getDegreeNumber().toString(), interfaceList))
+ .collect(Collectors.toList()));
}
return cpToDegreeList;
}
+ private Map<McCapabilitiesKey, McCapabilities> getMcCapabilities(Map<Integer, Degree> degrees,
+ List<SharedRiskGroup> srgs, String nodeId) {
+ LOG.info("{} : Getting the MC capabilities for degrees", nodeId);
+ Map<McCapabilitiesKey, McCapabilities> mcCapabilities = degrees.values().stream()
+ .map(degree -> createMcCapDegreeObject(degree, nodeId))
+ .collect(Collectors.toMap(McCapabilities::key, mcc -> mcc));
+ // Add the SRG mc-capabilities
+ LOG.info("{} : Getting the MC capabilities for SRGs", nodeId);
+ mcCapabilities.putAll(srgs.stream().map(srg -> createMcCapSrgObject(srg, nodeId))
+ .collect(Collectors.toMap(McCapabilities::key, mcCapabilities2 -> mcCapabilities2)));
+ return mcCapabilities;
+ }
+
private boolean postPortMapping(String nodeId, NodeInfo nodeInfo, List<Mapping> portMapList,
- List<CpToDegree> cp2DegreeList) {
- NodesBuilder nodesBldr = new NodesBuilder();
- nodesBldr.withKey(new NodesKey(nodeId)).setNodeId(nodeId);
+ List<CpToDegree> cp2DegreeList, List<SwitchingPoolLcp> splList,
+ Map<McCapabilitiesKey, McCapabilities> mcCapabilities) {
+ NodesBuilder nodesBldr = new NodesBuilder().withKey(new NodesKey(nodeId)).setNodeId(nodeId);
if (nodeInfo != null) {
nodesBldr.setNodeInfo(nodeInfo);
}
if (portMapList != null) {
- nodesBldr.setMapping(portMapList);
+ Map<MappingKey, Mapping> mappingMap = new HashMap<>();
+ // No element in the list below should be null at this stage
+ for (Mapping mapping: portMapList) {
+ mappingMap.put(mapping.key(), mapping);
+ }
+ nodesBldr.setMapping(mappingMap);
}
if (cp2DegreeList != null) {
- nodesBldr.setCpToDegree(cp2DegreeList);
+ Map<CpToDegreeKey, CpToDegree> cpToDegreeMap = new HashMap<>();
+ // No element in the list below should be null at this stage
+ for (CpToDegree cp2Degree: cp2DegreeList) {
+ cpToDegreeMap.put(cp2Degree.key(), cp2Degree);
+ }
+ nodesBldr.setCpToDegree(cpToDegreeMap);
}
- List<Nodes> nodesList = new ArrayList<>();
- nodesList.add(nodesBldr.build());
+ if (splList != null) {
+ Map<SwitchingPoolLcpKey,SwitchingPoolLcp> splMap = new HashMap<>();
+ // No element in the list below should be null at this stage
+ for (SwitchingPoolLcp spl: splList) {
+ splMap.put(spl.key(), spl);
+ }
+ nodesBldr.setSwitchingPoolLcp(splMap);
+ }
+ if (mcCapabilities != null) {
+ nodesBldr.setMcCapabilities(mcCapabilities);
+ }
+ Map<NodesKey,Nodes> nodesList = new HashMap<>();
+ Nodes nodes = nodesBldr.build();
+ nodesList.put(nodes.key(),nodes);
- NetworkBuilder nwBldr = new NetworkBuilder();
- nwBldr.setNodes(nodesList);
+ Network network = new NetworkBuilder().setNodes(nodesList).build();
final WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction();
InstanceIdentifier<Network> nodesIID = InstanceIdentifier.builder(Network.class).build();
- Network network = nwBldr.build();
writeTransaction.merge(LogicalDatastoreType.CONFIGURATION, nodesIID, network);
FluentFuture<? extends @NonNull CommitInfo> commit = writeTransaction.commit();
try {
commit.get();
return true;
-
} catch (InterruptedException | ExecutionException e) {
- LOG.warn("Failed to post {}", network, e);
+ LOG.warn("{} : Failed to post {}", nodeId, network, e);
return false;
}
}
- private CpToDegree createCpToDegreeObject(String circuitPackName, String degreeNumber, String nodeId,
- Map<String, String> interfaceList) {
- String interfaceName = null;
- if (interfaceList.get(circuitPackName) != null) {
- interfaceName = interfaceList.get(circuitPackName);
+ private CpToDegree createCpToDegreeObject(String circuitPackName, String degreeNumber,
+ Map<String, String> interfaceList) {
+ return new CpToDegreeBuilder()
+ .withKey(new CpToDegreeKey(circuitPackName))
+ .setCircuitPackName(circuitPackName)
+ .setDegreeNumber(Uint32.valueOf(degreeNumber))
+ .setInterfaceName(interfaceList.get(circuitPackName)).build();
+ }
+
+ private McCapabilities createMcCapDegreeObject(Degree degree, String nodeId) {
+ String mcNodeName = "DEG" + degree.getDegreeNumber().toString() + "-TTP";
+ McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder()
+ .withKey(new McCapabilitiesKey(mcNodeName))
+ .setMcNodeName(mcNodeName);
+ if (degree.getMcCapabilities() == null) {
+ LOG.warn("{} : Media channel capabilities are not advertised for degree {} - assuming fixed grid",
+ nodeId, degree.getDegreeNumber());
+ mcCapabilitiesBuilder
+ .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance("50"))
+ .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance("50"));
+ } else {
+ mcCapabilitiesBuilder
+ .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance(degree.getMcCapabilities()
+ .getCenterFreqGranularity().getValue().toString()))
+ .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance(degree.getMcCapabilities()
+ .getSlotWidthGranularity().getValue().toString()));
+ }
+ return mcCapabilitiesBuilder.build();
+ }
+
+ private McCapabilities createMcCapSrgObject(SharedRiskGroup srg, String nodeId) {
+ String mcNodeName = "SRG" + srg.getSrgNumber().toString() + "-PP";
+ McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder()
+ .withKey(new McCapabilitiesKey(mcNodeName))
+ .setMcNodeName(mcNodeName);
+ if (srg.getMcCapabilities() == null) {
+ LOG.warn("{} : Media channel capabilities are not advertised for SRG {} - assuming fixed grid",
+ nodeId, srg.getSrgNumber());
+ mcCapabilitiesBuilder
+ .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance("50"))
+ .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance("50"));
+ } else {
+ mcCapabilitiesBuilder
+ .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance(srg.getMcCapabilities()
+ .getCenterFreqGranularity().getValue().toString()))
+ .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance(srg.getMcCapabilities()
+ .getSlotWidthGranularity().getValue().toString()));
}
- return new CpToDegreeBuilder().withKey(new CpToDegreeKey(circuitPackName)).setCircuitPackName(circuitPackName)
- .setDegreeNumber(new Long(degreeNumber)).setInterfaceName(interfaceName).build();
+ return mcCapabilitiesBuilder.build();
}
private Mapping createMappingObject(String nodeId, Ports port, String circuitPackName,
- String logicalConnectionPoint) {
- MappingBuilder mpBldr = new MappingBuilder();
- mpBldr.withKey(new MappingKey(logicalConnectionPoint)).setLogicalConnectionPoint(logicalConnectionPoint)
- .setSupportingCircuitPackName(circuitPackName).setSupportingPort(port.getPortName())
- .setPortDirection(port.getPortDirection().getName());
+ String logicalConnectionPoint) {
+ MappingBuilder mpBldr = new MappingBuilder()
+ .withKey(new MappingKey(logicalConnectionPoint))
+ .setLogicalConnectionPoint(logicalConnectionPoint)
+ .setSupportingCircuitPackName(circuitPackName)
+ .setSupportingPort(port.getPortName())
+ .setPortDirection(port.getPortDirection().getName());
+ if ((port.getInterfaces() == null)
+ || (!logicalConnectionPoint.contains(StringConstants.TTP_TOKEN)
+ && !logicalConnectionPoint.contains(StringConstants.NETWORK_TOKEN))) {
+ return mpBldr.build();
+ }
// Get OMS and OTS interface provisioned on the TTP's
- if (logicalConnectionPoint.contains(StringConstants.TTP_TOKEN) && (port.getInterfaces() != null)) {
- for (Interfaces interfaces : port.getInterfaces()) {
- try {
- Optional<Interface> openRoadmInterface = this.openRoadmInterfaces.getInterface(nodeId,
- interfaces.getInterfaceName());
- if (openRoadmInterface.isPresent()) {
- Class<? extends InterfaceType> interfaceType
- = (Class<? extends InterfaceType>) openRoadmInterface.get().getType();
- // Check if interface type is OMS or OTS
- if (interfaceType.equals(OpenROADMOpticalMultiplex.class)) {
- mpBldr.setSupportingOms(interfaces.getInterfaceName());
- }
- if (interfaceType.equals(OpticalTransport.class)) {
- mpBldr.setSupportingOts(interfaces.getInterfaceName());
- }
- } else {
- LOG.warn("Interface {} from node {} was null!", interfaces.getInterfaceName(), nodeId);
- }
- } catch (OpenRoadmInterfaceException ex) {
- LOG.warn("Error while getting interface {} from node {}!", interfaces.getInterfaceName(), nodeId,
- ex);
+ for (Interfaces interfaces : port.getInterfaces()) {
+ try {
+ Optional<Interface> openRoadmInterface = this.openRoadmInterfaces.getInterface(nodeId,
+ interfaces.getInterfaceName());
+ if (!openRoadmInterface.isPresent()) {
+ LOG.warn("{} : Interface {} was null!", nodeId, interfaces.getInterfaceName());
+ continue;
+ }
+ LOG.debug("{} : interface get from device is {} and of type {}",
+ nodeId, openRoadmInterface.get().getName(), openRoadmInterface.get().getType());
+ Class<? extends InterfaceType> interfaceType
+ = (Class<? extends InterfaceType>) openRoadmInterface.get().getType();
+ // Check if interface type is OMS or OTS
+ if (interfaceType.equals(OpenROADMOpticalMultiplex.class)) {
+ mpBldr.setSupportingOms(interfaces.getInterfaceName());
+ }
+ if (interfaceType.equals(OpticalTransport.class)) {
+ mpBldr.setSupportingOts(interfaces.getInterfaceName());
}
+ if (interfaceType.equals(OtnOdu.class)) {
+ mpBldr.setSupportingOdu4(interfaces.getInterfaceName());
+ }
+ } catch (OpenRoadmInterfaceException ex) {
+ LOG.warn("{} : Error while getting interface {} - ",
+ nodeId, interfaces.getInterfaceName(), ex);
}
}
return mpBldr.build();
}
private Mapping createXpdrMappingObject(String nodeId, Ports port, String circuitPackName,
- String logicalConnectionPoint, String partnerLcp, Mapping mapping, String assoLcp) {
- MappingBuilder mpBldr;
- if (mapping != null && assoLcp != null) {
+ String logicalConnectionPoint, String partnerLcp, Mapping mapping, String connectionMapLcp,
+ XpdrNodeTypes xpdrNodeType) {
+
+ if (mapping != null && connectionMapLcp != null) {
// update existing mapping
- mpBldr = new MappingBuilder(mapping);
- mpBldr.setAssociatedLcp(assoLcp);
- } else {
- // create a new mapping
- mpBldr = new MappingBuilder();
- mpBldr.withKey(new MappingKey(logicalConnectionPoint))
+ return new MappingBuilder(mapping).setConnectionMapLcp(connectionMapLcp).build();
+ }
+
+ // create a new mapping
+ String nodeIdLcp = nodeId + "-" + logicalConnectionPoint;
+ MappingBuilder mpBldr = new MappingBuilder()
+ .withKey(new MappingKey(logicalConnectionPoint))
.setLogicalConnectionPoint(logicalConnectionPoint)
.setSupportingCircuitPackName(circuitPackName)
.setSupportingPort(port.getPortName())
- .setPortDirection(port.getPortDirection().getName());
- if (port.getPortQual() != null) {
- mpBldr.setPortQual(port.getPortQual().getName());
- }
- if (partnerLcp != null) {
- mpBldr.setPartnerLcp(partnerLcp);
+ .setPortDirection(port.getPortDirection().getName())
+ .setLcpHashVal(FnvUtils.fnv1_64(nodeIdLcp));
+ if (port.getPortQual() != null) {
+ mpBldr.setPortQual(port.getPortQual().getName());
+ }
+ if (xpdrNodeType != null) {
+ mpBldr.setXponderType(
+ org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.XpdrNodeTypes.forValue(
+ xpdrNodeType.getIntValue()));
+ }
+ if (partnerLcp != null) {
+ mpBldr.setPartnerLcp(partnerLcp);
+ }
+ if (port.getSupportedInterfaceCapability() != null) {
+ List<Class<? extends org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327
+ .SupportedIfCapability>> supportedIntf = new ArrayList<>();
+ for (Class<? extends SupportedIfCapability> sup: port.getSupportedInterfaceCapability()) {
+ @SuppressWarnings("unchecked") Class<? extends
+ org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.SupportedIfCapability> sup1 =
+ (Class<? extends org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327
+ .SupportedIfCapability>) sup;
+ supportedIntf.add(sup1);
}
+ mpBldr.setSupportedInterfaceCapability(supportedIntf);
}
return mpBldr.build();
}
- //some LOG messages are too long
- @SuppressWarnings("checkstyle:linelength")
+ private Ports getPort2(Ports port, String nodeId, String circuitPackName, StringBuilder circuitPackName2,
+ //circuitPackName2 will be updated by reference contrary to circuitPackName
+ List<CircuitPacks> circuitPackList, Map<String, String> lcpMap) {
+ if (!checkPartnerPortNotNull(port)) {
+ LOG.warn("{} : port {} on {} - Error in the configuration ",
+ nodeId, port.getPortName(), circuitPackName);
+ return null;
+ }
+ if (lcpMap.containsKey(circuitPackName + '+' + port.getPortName())) {
+ return null;
+ }
+ Optional<CircuitPacks> cpOpt = circuitPackList.stream()
+ .filter(
+ cP -> cP.getCircuitPackName().equals(port.getPartnerPort().getCircuitPackName()))
+ .findFirst();
+ if (!cpOpt.isPresent()) {
+ LOG.error("{} : Error fetching circuit-pack {}",
+ nodeId, port.getPartnerPort().getCircuitPackName());
+ return null;
+ }
+ Optional<Ports> poOpt = cpOpt.get().nonnullPorts().values().stream()
+ .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName().toString()))
+ .findFirst();
+ if (!poOpt.isPresent()) {
+ LOG.error("{} : Error fetching port {} on {}",
+ nodeId, port.getPartnerPort().getPortName(), port.getPartnerPort().getCircuitPackName());
+ return null;
+ }
+ Ports port2 = poOpt.get();
+ circuitPackName2.append(cpOpt.get().getCircuitPackName());
+ if (!checkPartnerPort(circuitPackName, port, port2)) {
+ LOG.error("{} : port {} on {} is not a correct partner port of {} on {}",
+ nodeId, port2.getPortName(), circuitPackName2, port.getPortName(), circuitPackName);
+ return null;
+ }
+ return port2;
+ }
+
+
+ private void putXpdrLcpsInMaps(int line, String nodeId,
+ Integer xponderNb, XpdrNodeTypes xponderType,
+ String circuitPackName, String circuitPackName2, Ports port, Ports port2,
+ Map<String, String> lcpMap, Map<String, Mapping> mappingMap) {
+ String lcp1 = createXpdrLogicalConnectionPort(xponderNb, line, StringConstants.NETWORK_TOKEN);
+ String lcp2 = createXpdrLogicalConnectionPort(xponderNb, line + 1, StringConstants.NETWORK_TOKEN);
+ if (lcpMap.containsKey(lcp1) || lcpMap.containsKey(lcp2)) {
+ LOG.warn("{} : mapping already exists for {} or {}", nodeId, lcp1, lcp2);
+ return;
+ }
+ lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1);
+ lcpMap.put(circuitPackName2 + '+' + port2.getPortName(), lcp2);
+ mappingMap.put(lcp1,
+ createXpdrMappingObject(nodeId, port, circuitPackName, lcp1, lcp2, null, null, xponderType));
+ mappingMap.put(lcp2,
+ createXpdrMappingObject(nodeId, port2, circuitPackName2, lcp2, lcp1, null, null, xponderType));
+ return;
+ }
+
+ private int[] fillXpdrLcpsMaps(int line, int client, String nodeId,
+ Integer xponderNb, XpdrNodeTypes xponderType,
+ String circuitPackName, Ports port,
+ List<CircuitPacks> circuitPackList, Map<String, String> lcpMap, Map<String, Mapping> mappingMap) {
+ if (port.getPortQual() == null) {
+ LOG.warn("{} : port {} on {} - PortQual was not found",
+ nodeId, port.getPortName(), circuitPackName);
+ return new int[] {line, client};
+ }
+
+ switch (port.getPortQual()) {
+
+ case XpdrClient:
+ case SwitchClient:
+ String lcp0 = createXpdrLogicalConnectionPort(xponderNb, client, StringConstants.CLIENT_TOKEN);
+ lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp0);
+ mappingMap.put(lcp0,
+ createXpdrMappingObject(nodeId, port, circuitPackName, lcp0, null, null, null, null));
+ client++;
+ break;
+
+ case XpdrNetwork:
+ case SwitchNetwork:
+ line = fillXpdrNetworkLcpsMaps(line, nodeId,
+ xponderNb, xponderType,
+ circuitPackName, port,
+ circuitPackList, lcpMap, mappingMap);
+ break;
+
+ default:
+ LOG.error("{} : port {} on {} - unsupported PortQual {}",
+ nodeId, port.getPortName(), circuitPackName, port.getPortQual());
+ }
+ return new int[] {line, client};
+ }
+
+ private int fillXpdrNetworkLcpsMaps(int line, String nodeId,
+ Integer xponderNb, XpdrNodeTypes xponderType,
+ String circuitPackName, Ports port,
+ List<CircuitPacks> circuitPackList, Map<String, String> lcpMap, Map<String, Mapping> mappingMap) {
+
+ switch (port.getPortDirection()) {
+
+ case Bidirectional:
+ String lcp = createXpdrLogicalConnectionPort(xponderNb, line, StringConstants.NETWORK_TOKEN);
+ lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp);
+ mappingMap.put(lcp,
+ createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, null, xponderType));
+ line++;
+ break;
+
+ case Rx:
+ case Tx:
+ StringBuilder circuitPackName2 = new StringBuilder();
+ Ports port2 = getPort2(port, nodeId, circuitPackName, circuitPackName2,
+ circuitPackList, lcpMap);
+
+ if (port2 == null) {
+ //key already present or an error occured and was logged
+ return line;
+ }
+
+ putXpdrLcpsInMaps(line, nodeId, xponderNb, xponderType,
+ circuitPackName, circuitPackName2.toString(), port, port2,
+ lcpMap, mappingMap);
+ line += 2;
+ break;
+
+ default:
+ LOG.error("{} : port {} on {} - unsupported Direction {}",
+ nodeId, port.getPortName(), circuitPackName, port.getPortDirection());
+ }
+
+ return line;
+ }
+
+ private boolean createMcCapabilitiesList(String nodeId, Info deviceInfo,
+ Map<McCapabilitiesKey, McCapabilities> mcCapabilitiesMap) {
+ Map<Integer, Degree> degrees = getDegreesMap(nodeId, deviceInfo);
+ List<SharedRiskGroup> srgs = getSrgs(nodeId, deviceInfo);
+ mcCapabilitiesMap.putAll(getMcCapabilities(degrees, srgs, nodeId));
+ return true;
+ }
+
private boolean createTtpPortMapping(String nodeId, Info deviceInfo, List<Mapping> portMapList) {
// Creating mapping data for degree TTP's
- List<Degree> degrees = getDegrees(nodeId, deviceInfo);
+ Map<Integer, Degree> degrees = getDegreesMap(nodeId, deviceInfo);
Map<String, String> interfaceList = getEthInterfaceList(nodeId);
- List<CpToDegree> cpToDegreeList = getCpToDegreeList(degrees, nodeId, interfaceList);
- LOG.info("Map looks like this {}", interfaceList);
- postPortMapping(nodeId, null, null, cpToDegreeList);
+ List<CpToDegree> cpToDegreeList = getCpToDegreeList(degrees, interfaceList);
+ LOG.info("{} : Map looks like this {}", nodeId, interfaceList);
+ postPortMapping(nodeId, null, null, cpToDegreeList, null, null);
Map<Integer, List<ConnectionPorts>> connectionPortMap = getPerDegreePorts(nodeId, deviceInfo);
- for (Integer k : connectionPortMap.keySet()) {
- switch (connectionPortMap.get(k).size()) {
+ for (Entry<Integer, List<ConnectionPorts>> cpMapEntry : connectionPortMap.entrySet()) {
+ switch (connectionPortMap.get(cpMapEntry.getKey()).size()) {
case 1:
// port is bidirectional
InstanceIdentifier<Ports> portID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(CircuitPacks.class, new CircuitPacksKey(connectionPortMap.get(k).get(0)
- .getCircuitPackName()))
- .child(Ports.class, new PortsKey(connectionPortMap.get(k).get(0)
- .getPortName().toString()));
- LOG.info("Fetching connection-port {} at circuit pack {}", connectionPortMap.get(k).get(0)
- .getPortName().toString(), connectionPortMap.get(k).get(0).getCircuitPackName());
+ .child(CircuitPacks.class,
+ new CircuitPacksKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName()))
+ .child(Ports.class,
+ new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString()));
+ LOG.debug("{} : Fetching connection-port {} at circuit pack {}",
+ nodeId,
+ connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(),
+ connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName());
Optional<Ports> portObject = this.deviceTransactionManager.getDataFromDevice(nodeId,
LogicalDatastoreType.OPERATIONAL, portID, Timeouts.DEVICE_READ_TIMEOUT,
Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- if (portObject.isPresent()) {
- Ports port = portObject.get();
- if (port.getPortQual() == null) {
- continue;
- } else if (Port.PortQual.RoadmExternal.getIntValue() == port.getPortQual().getIntValue()
- && Direction.Bidirectional.getIntValue() == port.getPortDirection().getIntValue()) {
- String logicalConnectionPoint = new StringBuilder("DEG").append(k).append("-TTP-TXRX")
- .toString();
- LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId,
- connectionPortMap.get(k).get(0).getCircuitPackName(), port.getPortName(),
- logicalConnectionPoint);
- portMapList.add(createMappingObject(nodeId, port,
- connectionPortMap.get(k).get(0).getCircuitPackName(), logicalConnectionPoint));
- } else {
- LOG.error(
- "Impossible to create logical connection point for port {} of {} on node {} - Error in configuration with port-qual or port-direction",
- port.getPortName(), connectionPortMap.get(k).get(0).getCircuitPackName(), nodeId);
- }
- } else {
- LOG.error("No port {} on circuit pack {} for node {}",
- connectionPortMap.get(k).get(0).getPortName().toString(),
- connectionPortMap.get(k).get(0).getCircuitPackName(), nodeId);
+ if (!portObject.isPresent()) {
+ LOG.error("{} : No port {} on circuit pack {}",
+ nodeId,
+ connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(),
+ connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName());
return false;
}
+ Ports port = portObject.get();
+ if (port.getPortQual() == null) {
+ continue;
+ }
+ if (PortQual.RoadmExternal.getIntValue() != port.getPortQual().getIntValue()
+ || Direction.Bidirectional.getIntValue() != port.getPortDirection().getIntValue()) {
+ LOG.error("{} : port {} on {} - Impossible to create logical connection point"
+ + " - Error in configuration with port-qual or port-direction",
+ nodeId, port.getPortName(),
+ connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName());
+ continue;
+ }
+ String logicalConnectionPoint = new StringBuilder("DEG")
+ .append(cpMapEntry.getKey())
+ .append("-TTP-TXRX")
+ .toString();
+ LOG.info("{} : Logical Connection Point for {} on {} is {}",
+ nodeId,
+ port.getPortName(), connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(),
+ logicalConnectionPoint);
+ portMapList.add(createMappingObject(nodeId, port,
+ connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(),
+ logicalConnectionPoint));
break;
case 2:
// ports are unidirectionals
- String cp1Name = connectionPortMap.get(k).get(0).getCircuitPackName();
- String cp2Name = connectionPortMap.get(k).get(1).getCircuitPackName();
+ String cp1Name = connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName();
+ String cp2Name = connectionPortMap.get(cpMapEntry.getKey()).get(1).getCircuitPackName();
InstanceIdentifier<Ports> port1ID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(CircuitPacks.class, new CircuitPacksKey(cp1Name))
- .child(Ports.class, new PortsKey(connectionPortMap.get(k).get(0).getPortName().toString()));
- LOG.info("Fetching connection-port {} at circuit pack {}", connectionPortMap.get(k).get(0)
- .getPortName().toString(), cp1Name);
+ .child(Ports.class,
+ new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString()));
+ LOG.debug("{} : Fetching connection-port {} at circuit pack {}",
+ nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), cp1Name);
Optional<Ports> port1Object = this.deviceTransactionManager.getDataFromDevice(nodeId,
LogicalDatastoreType.OPERATIONAL, port1ID, Timeouts.DEVICE_READ_TIMEOUT,
Timeouts.DEVICE_READ_TIMEOUT_UNIT);
InstanceIdentifier<Ports> port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(CircuitPacks.class, new CircuitPacksKey(cp2Name))
- .child(Ports.class, new PortsKey(connectionPortMap.get(k).get(1).getPortName().toString()));
- LOG.info("Fetching connection-port {} at circuit pack {}",
- connectionPortMap.get(k).get(1).getPortName().toString(), cp2Name);
+ .child(Ports.class,
+ new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName().toString()));
+ LOG.debug("{} : Fetching connection-port {} at circuit pack {}",
+ nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName(), cp2Name);
Optional<Ports> port2Object = this.deviceTransactionManager.getDataFromDevice(nodeId,
LogicalDatastoreType.OPERATIONAL, port2ID, Timeouts.DEVICE_READ_TIMEOUT,
Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- if (port1Object.isPresent() && port2Object.isPresent()) {
- Ports port1 = port1Object.get();
- Ports port2 = port2Object.get();
- if (port1.getPortQual() == null || port2.getPortQual() == null) {
- continue;
- } else if ((Port.PortQual.RoadmExternal.getIntValue() == port1.getPortQual().getIntValue()
- && Port.PortQual.RoadmExternal.getIntValue() == port2.getPortQual().getIntValue()
- && Direction.Rx.getIntValue() == port1.getPortDirection().getIntValue()
- && Direction.Tx.getIntValue() == port2.getPortDirection().getIntValue()
- && port1.getPartnerPort() != null && port2.getPartnerPort() != null
- && port1.getPartnerPort().getCircuitPackName().equals(cp2Name)
- && port1.getPartnerPort().getPortName().equals(port2.getPortName().toString())
- && port2.getPartnerPort().getCircuitPackName().equals(cp1Name)
- && port2.getPartnerPort().getPortName().equals(port1.getPortName()))
- ||
- (Port.PortQual.RoadmExternal.getIntValue() == port1.getPortQual().getIntValue()
- && Port.PortQual.RoadmExternal.getIntValue() == port2.getPortQual().getIntValue()
- && Direction.Rx.getIntValue() == port2.getPortDirection().getIntValue()
- && Direction.Tx.getIntValue() == port1.getPortDirection().getIntValue()
- && port1.getPartnerPort() != null && port2.getPartnerPort() != null
- && port1.getPartnerPort().getCircuitPackName().equals(cp2Name)
- && port1.getPartnerPort().getPortName().equals(port2.getPortName().toString())
- && port2.getPartnerPort().getCircuitPackName().equals(cp1Name)
- && port2.getPartnerPort().getPortName().equals(port1.getPortName().toString()))) {
- String logicalConnectionPoint1 = new StringBuilder("DEG").append(k).append("-TTP-")
- .append(port1.getPortDirection().getName().toUpperCase()).toString();
- LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId,
- connectionPortMap.get(k).get(0).getCircuitPackName(), port1.getPortName(),
- logicalConnectionPoint1);
- portMapList.add(createMappingObject(nodeId, port1, connectionPortMap.get(k).get(0)
- .getCircuitPackName(), logicalConnectionPoint1));
- String logicalConnectionPoint2 = new StringBuilder("DEG").append(k).append("-TTP-")
- .append(port2.getPortDirection().getName().toUpperCase()).toString();
- LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId,
- connectionPortMap.get(k).get(1).getCircuitPackName(), port2.getPortName(),
- logicalConnectionPoint2);
- portMapList.add(createMappingObject(nodeId, port2, connectionPortMap.get(k).get(1)
- .getCircuitPackName(), logicalConnectionPoint2));
- } else {
- LOG.error(
- "impossible to create logical connection point for port {} or port {} on node {} - Error in configuration with port-qual, port-direction or partner-port configuration",
- port1.getPortName(), port2.getPortName(), nodeId);
- }
- } else {
- LOG.error("No port {} on circuit pack {} for node {}",
- connectionPortMap.get(k).get(0).getPortName().toString(),
- connectionPortMap.get(k).get(0).getCircuitPackName(), nodeId);
+ if (!port1Object.isPresent() || !port2Object.isPresent()) {
+ LOG.error("{} : No port {} on circuit pack {}",
+ nodeId,
+ connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(),
+ connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName());
return false;
}
+ Ports port1 = port1Object.get();
+ Ports port2 = port2Object.get();
+ if (port1.getPortQual() == null || port2.getPortQual() == null) {
+ continue;
+ }
+ if (PortQual.RoadmExternal.getIntValue() != port1.getPortQual().getIntValue()
+ || PortQual.RoadmExternal.getIntValue() != port2.getPortQual().getIntValue()) {
+ LOG.error("{} : Impossible to create logical connection point for port {} or port {}"
+ + " - Error in configuration with port-qual",
+ nodeId, port1.getPortName(), port2.getPortName());
+ continue;
+ }
+ if (!checkPartnerPort(cp1Name, port1, port2)) {
+ LOG.error("{} : port {} on {} is not a correct partner port of {} on {}",
+ nodeId, port2.getPortName(), cp2Name, port1.getPortName(), cp1Name);
+ continue;
+ }
+ // Directions checks are the same for cp1 and cp2, no need to check them twice.
+ if (!checkPartnerPortNoDir(cp2Name, port2, port1)) {
+ LOG.error("{} : port {} on {} is not a correct partner port of {} on {}",
+ nodeId, port1.getPortName(), cp1Name, port2.getPortName(), cp2Name);
+ continue;
+ }
+
+ String logicalConnectionPoint1 = new StringBuilder("DEG")
+ .append(cpMapEntry.getKey())
+ .append("-TTP-")
+ .append(port1.getPortDirection().getName().toUpperCase(Locale.getDefault()))
+ .toString();
+ LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId,
+ connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(),
+ port1.getPortName(), logicalConnectionPoint1);
+ portMapList.add(createMappingObject(nodeId, port1,
+ connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(),
+ logicalConnectionPoint1));
+ String logicalConnectionPoint2 = new StringBuilder("DEG")
+ .append(cpMapEntry.getKey())
+ .append("-TTP-")
+ .append(port2.getPortDirection().getName().toUpperCase(Locale.getDefault()))
+ .toString();
+ LOG.info("{} : Logical Connection Point for {} {} is {}",
+ nodeId,
+ connectionPortMap.get(cpMapEntry.getKey()).get(1).getCircuitPackName(),
+ port2.getPortName(), logicalConnectionPoint2);
+ portMapList.add(createMappingObject(nodeId, port2,
+ connectionPortMap.get(cpMapEntry.getKey()).get(1).getCircuitPackName(),
+ logicalConnectionPoint2));
break;
default:
- LOG.error("Number of connection port for DEG{} on {} is incorrect", k, nodeId);
+ LOG.error("{} : Number of connection port for DEG{} is incorrect", nodeId, cpMapEntry.getKey());
continue;
}
}
}
private NodeInfo createNodeInfo(Info deviceInfo) {
- NodeInfoBuilder nodeInfoBldr = new NodeInfoBuilder();
- if (deviceInfo.getNodeType() != null) {
- nodeInfoBldr = new NodeInfoBuilder()
- .setOpenroadmVersion(OpenroadmVersion._221)
- .setNodeType(deviceInfo.getNodeType());
- if (deviceInfo.getClli() != null && !deviceInfo.getClli().isEmpty()) {
- nodeInfoBldr.setNodeClli(deviceInfo.getClli());
- } else {
- nodeInfoBldr.setNodeClli("defaultCLLI");
- }
- if (deviceInfo.getModel() != null) {
- nodeInfoBldr.setNodeModel(deviceInfo.getModel());
- }
- if (deviceInfo.getVendor() != null) {
- nodeInfoBldr.setNodeVendor(deviceInfo.getVendor());
- }
- if (deviceInfo.getIpAddress() != null) {
- nodeInfoBldr.setNodeIpAddress(deviceInfo.getIpAddress());
- }
- } else {
- // TODO make mandatory in yang
+
+ if (deviceInfo.getNodeType() == null) {
+ // TODO make mandatory in yang
LOG.error("Node type field is missing");
return null;
}
+
+ NodeInfoBuilder nodeInfoBldr = new NodeInfoBuilder()
+ .setOpenroadmVersion(OpenroadmVersion._221)
+ .setNodeType(NodeTypes.forValue(deviceInfo.getNodeType().getIntValue()));
+ if (deviceInfo.getClli() != null && !deviceInfo.getClli().isEmpty()) {
+ nodeInfoBldr.setNodeClli(deviceInfo.getClli());
+ } else {
+ nodeInfoBldr.setNodeClli("defaultCLLI");
+ }
+ if (deviceInfo.getModel() != null) {
+ nodeInfoBldr.setNodeModel(deviceInfo.getModel());
+ }
+ if (deviceInfo.getVendor() != null) {
+ nodeInfoBldr.setNodeVendor(deviceInfo.getVendor());
+ }
+ if (deviceInfo.getIpAddress() != null) {
+ nodeInfoBldr.setNodeIpAddress(deviceInfo.getIpAddress());
+ }
+
return nodeInfoBldr.build();
}
Code Review / transportpce.git / blobdiff