package org.opendaylight.transportpce.common.mapping;
import com.google.common.util.concurrent.FluentFuture;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
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;
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())) {
- 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().nonnullPorts()
- .values().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 {
+
+ switch (port.getPortQual()) {
+
+ case XpdrClient:
+ String lcp0 = "XPDR1-" + StringConstants.CLIENT_TOKEN + client;
+ lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp0);
+ mappingMap.put(lcp0,
+ createXpdrMappingObject(nodeId, port, circuitPackName, lcp0, null, null, null));
+ client++;
+ //continue;
+ break;
+
+ case XpdrNetwork:
+ if (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++;
+ continue;
+ }
+ // TODO PortDirection treatment here is similar to the one in createPpPortMapping.
+ // Some code alignment must be considered.
+
+ if (port.getPartnerPort() == null
+ || port.getPartnerPort().getCircuitPackName() == null
+ || port.getPartnerPort().getPortName() == null) {
+ LOG.warn("Error in the configuration of port {} of {} for {}",
+ port.getPortName(), circuitPackName, nodeId);
+ continue;
+ }
+
+ if (lcpMap.containsKey(circuitPackName + '+' + port.getPortName())) {
+ continue;
+ }
+
+ Optional<CircuitPacks> cpOpt = circuitPackList.stream()
+ .filter(cP -> cP.getCircuitPackName().equals(port.getPartnerPort().getCircuitPackName()))
+ .findFirst();
+ if (!cpOpt.isPresent()) {
+ LOG.error("Error fetching circuit-pack {} for {}",
+ port.getPartnerPort().getCircuitPackName(), nodeId);
+ continue;
+ }
+
+ 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 {} for {}", port.getPartnerPort().getPortName(),
port.getPartnerPort().getCircuitPackName(), nodeId);
+ continue;
}
- } else {
- LOG.error("Error fetching circuit-pack {} for {}", port.getPartnerPort().getCircuitPackName(),
- nodeId);
- }
- } 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 port2 = poOpt.get();
+ if (!checkPartnerPort(circuitPackName, port, port2)) {
+ LOG.error("port {} on {} is not a correct partner port of {} on {}",
+ port2.getPortName(), cpOpt.get().getCircuitPackName(), port.getPortName(),
+ circuitPackName);
+ continue;
+ }
+ String lcp1 = "XPDR1-" + StringConstants.NETWORK_TOKEN + line;
+ String lcp2 = new StringBuilder("XPDR1-")
+ .append(StringConstants.NETWORK_TOKEN)
+ .append(line + 1)
+ .toString();
+ if (lcpMap.containsKey(lcp1) || lcpMap.containsKey(lcp2)) {
+ LOG.warn("mapping already exists for {} or {}", lcp1, lcp2);
+ line += 2;
+ continue;
+ }
+ 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));
+ line += 2;
+ break;
+
+ default:
+ LOG.warn(
+ "Error in the configuration of port {} of {} for {} - unsupported PortQual {}",
+ port.getPortName(), circuitPackName, nodeId, port.getPortQual().getIntValue());
}
}
}
+
Collection<ConnectionMap> connectionMap = deviceObject.get().nonnullConnectionMap().values();
- 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 slcp = lcpMap.containsKey(skey) ? lcpMap.get(skey) : null;
Destination destination0 = cm.nonnullDestination().values().iterator().next();
String dkey = destination0.getCircuitPackName() + "+" + destination0.getPortName();
- if (lcpMap.containsKey(dkey)) {
- dlcp = lcpMap.get(dkey);
- }
- if (slcp != 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");
+ if (slcp == null) {
+ LOG.error("Error in connection-map analysis for source {} and destination (circuitpack+port) {}",
+ 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));
}
+
if (!mappingMap.isEmpty()) {
for (Mapping m : mappingMap.values()) {
portMapList.add(m);
return true;
}
+ private boolean checkPartnerPort(String circuitPackName, Ports port1, Ports port2) {
+ if (port2.getPartnerPort() == null
+ || port2.getPartnerPort().getCircuitPackName() == null
+ || port2.getPartnerPort().getPortName() == null
+ || !port2.getPartnerPort().getCircuitPackName().equals(circuitPackName)
+ || !port2.getPartnerPort().getPortName().equals(port1.getPortName())
+ || ((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.rev170206.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.rev170206.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().toJava();
- } 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.rev170206.srg.CircuitPacks> srgCps
= new ArrayList<>();
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.rev170206.srg.CircuitPacks>> srgCps
= getSrgCps(nodeId, deviceInfo);
- for (Entry<Integer, List<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.srg.CircuitPacks>> srgCpEntry : srgCps.entrySet()) {
+ for (Entry<Integer, List<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.srg.CircuitPacks>>
+ srgCpEntry : srgCps.entrySet()) {
List<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.srg.CircuitPacks> cpList =
srgCps.get(srgCpEntry.getKey());
List<String> keys = new ArrayList<>();
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, srgCpEntry.getKey(), 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, srgCpEntry.getKey(),
- 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 (Port.PortQual.RoadmExternal.getIntValue() != port.getPortQual().getIntValue()) {
+ LOG.info("{} : port {} on {} is not roadm-external - cannot assign logicalConnectionPoint.",
+ nodeId, port.getPortName(), circuitPackName);
+ continue;
+ }
+
+ if (keys.contains(currentKey)) {
+ LOG.info("{} : 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("{} : Logical Connection Point for {} {} is {}",
+ nodeId, circuitPackName, port.getPortName(), lcp);
+ portMapList.add(createMappingObject(nodeId, port, circuitPackName, lcp));
+ portIndex++;
+ keys.add(currentKey);
+ break;
+
+ case Rx:
+ case Tx:
+ if (port.getPartnerPort() == null) {
+ LOG.info("{} : port {} on {} is unidirectional but has no partnerPort"
+ + " - cannot assign logicalConnectionPoint.",
+ nodeId, port.getPortName(), circuitPackName);
+ continue;
+ }
+
+ String lcp1 = createLogicalConnectionPort(port, srgCpEntry.getKey(), portIndex);
+ LOG.info("{} : Logical Connection Point for {} {} is {}",
+ nodeId, circuitPackName, port.getPortName(), 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()
+ != Port.PortQual.RoadmExternal.getIntValue()) {
+ LOG.error("error getting partner port {} of {} - {}",
+ port.getPartnerPort().getPortName().toString(),
+ port.getPartnerPort().getCircuitPackName(), nodeId);
+ 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, srgCpEntry.getKey(),
- 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 {
+ if (!checkPartnerPort(circuitPackName, port, port2)) {
LOG.error("Error with partner port configuration for port {} of {} - {}",
port.getPortName(), circuitPackName, nodeId);
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("{} : Logical Connection Point for {} {} is {}",
+ nodeId, circuitPackName, port2.getPortName(), 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.info("{} : port {} on {} - unsupported Direction"
+ + " - cannot assign logicalConnectionPoint.",
+ nodeId, port.getPortName(), circuitPackName);
+
}
}
}
private List<Degree> getDegrees(String deviceId, Info ordmInfo) {
List<Degree> degrees = new ArrayList<>();
- Integer maxDegree;
// 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().toJava();
- } 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);
private Map<Integer, List<ConnectionPorts>> getPerDegreePorts(String deviceId, Info ordmInfo) {
Map<Integer, List<ConnectionPorts>> conPortMap = new HashMap<>();
- Integer maxDegree;
+ Integer maxDegree = ordmInfo.getMaxDegrees() == null ? 20 : ordmInfo.getMaxDegrees().toJava();
- if (ordmInfo.getMaxDegrees() != null) {
- maxDegree = ordmInfo.getMaxDegrees().toJava();
- } 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)
private Map<String, String> getEthInterfaceList(String nodeId) {
LOG.info("It is calling get ethernet interface");
- Map<String, String> cpToInterfaceMap = new HashMap<>();
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.nonnullPortConfig().values()) {
- 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 for Node : {} - 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..");
return cpToInterfaceMap;
}
private List<CpToDegree> getCpToDegreeList(List<Degree> degrees, String nodeId,
- Map<String, String> interfaceList) {
+ 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.nonnullCircuitPacks().values().stream()
- .map(cp -> createCpToDegreeObject(cp.getCircuitPackName(),
- degree.getDegreeNumber().toString(), nodeId, interfaceList))
- .collect(Collectors.toList()));
+ if (degree.getCircuitPacks() == null) {
+ continue;
}
+ LOG.info("Inside CP to degree list");
+ cpToDegreeList.addAll(degree.nonnullCircuitPacks().values().stream()
+ .map(cp -> createCpToDegreeObject(cp.getCircuitPackName(),
+ degree.getDegreeNumber().toString(), nodeId, interfaceList))
+ .collect(Collectors.toList()));
}
return cpToDegreeList;
}
private boolean postPortMapping(String nodeId, NodeInfo nodeInfo, List<Mapping> portMapList,
- List<CpToDegree> cp2DegreeList) {
+ List<CpToDegree> cp2DegreeList) {
NodesBuilder nodesBldr = new NodesBuilder().withKey(new NodesKey(nodeId)).setNodeId(nodeId);
if (nodeInfo != null) {
nodesBldr.setNodeInfo(nodeInfo);
if (portMapList != null) {
Map<MappingKey, Mapping> mappingMap = new HashMap<>();
for (Mapping mapping: portMapList) {
- if (mapping != null) {
- mappingMap.put(mapping.key(), mapping);
+ if (mapping == null) {
+ continue;
}
+ mappingMap.put(mapping.key(), mapping);
}
nodesBldr.setMapping(mappingMap);
}
if (cp2DegreeList != null) {
Map<CpToDegreeKey, CpToDegree> cpToDegreeMap = new HashMap<>();
for (CpToDegree cp2Degree: cp2DegreeList) {
- if (cp2Degree != null) {
- cpToDegreeMap.put(cp2Degree.key(), cp2Degree);
+ if (cp2Degree == null) {
+ continue;
}
+ cpToDegreeMap.put(cp2Degree.key(), cp2Degree);
}
nodesBldr.setCpToDegree(cpToDegreeMap);
}
}
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);
- }
- return new CpToDegreeBuilder().withKey(new CpToDegreeKey(circuitPackName)).setCircuitPackName(circuitPackName)
- .setDegreeNumber(Uint32.valueOf(degreeNumber)).setInterfaceName(interfaceName).build();
+ Map<String, String> interfaceList) {
+ return new CpToDegreeBuilder()
+ .withKey(new CpToDegreeKey(circuitPackName))
+ .setCircuitPackName(circuitPackName)
+ .setDegreeNumber(Uint32.valueOf(degreeNumber))
+ .setInterfaceName(interfaceList.get(circuitPackName)).build();
}
private Mapping createMappingObject(String nodeId, Ports port, String circuitPackName,
String logicalConnectionPoint) {
-
MappingBuilder mpBldr = new MappingBuilder()
.withKey(new MappingKey(logicalConnectionPoint))
.setLogicalConnectionPoint(logicalConnectionPoint)
.setSupportingPort(port.getPortName())
.setPortDirection(port.getPortDirection().getName());
+ if (!logicalConnectionPoint.contains(StringConstants.TTP_TOKEN) || (port.getInterfaces() == null)) {
+ 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 {} from node {} was null!", interfaces.getInterfaceName(), nodeId);
+ continue;
+ }
+ 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());
+ }
+ } catch (OpenRoadmInterfaceException ex) {
+ LOG.warn("Error while getting interface {} from node {}!",
+ interfaces.getInterfaceName(), nodeId, ex);
}
}
return mpBldr.build();
return mpBldr.build();
}
- // some LOG messages are too long
- @SuppressWarnings("checkstyle:linelength")
- @SuppressFBWarnings("DM_CONVERT_CASE")
private boolean createTtpPortMapping(String nodeId, Info deviceInfo, List<Mapping> portMapList) {
// Creating mapping data for degree TTP's
List<Degree> degrees = getDegrees(nodeId, deviceInfo);
case 1:
// port is bidirectional
InstanceIdentifier<Ports> portID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .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.info("Fetching connection-port {} at circuit pack {}", connectionPortMap
- .get(cpMapEntry.getKey()).get(0).getPortName().toString(), connectionPortMap
- .get(cpMapEntry.getKey()).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.info("Fetching connection-port {} at circuit pack {}",
+ connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString(),
+ 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(cpMapEntry.getKey())
- .append("-TTP-TXRX").toString();
- LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId,
- connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(),
- port.getPortName(), logicalConnectionPoint);
- portMapList.add(createMappingObject(nodeId, port,
- connectionPortMap.get(cpMapEntry.getKey()).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(cpMapEntry.getKey()).get(0).getCircuitPackName(), nodeId);
- }
- } else {
+ if (!portObject.isPresent()) {
LOG.error("No port {} on circuit pack {} for node {}",
connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString(),
connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), nodeId);
return false;
}
+ Ports port = portObject.get();
+ if (port.getPortQual() == null) {
+ continue;
+ }
+ if (Port.PortQual.RoadmExternal.getIntValue() != port.getPortQual().getIntValue()
+ || Direction.Bidirectional.getIntValue() != port.getPortDirection().getIntValue()) {
+ 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(cpMapEntry.getKey()).get(0).getCircuitPackName(), nodeId);
+ continue;
+ }
+ String logicalConnectionPoint = new StringBuilder("DEG")
+ .append(cpMapEntry.getKey())
+ .append("-TTP-TXRX")
+ .toString();
+ LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId,
+ connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(),
+ port.getPortName(), logicalConnectionPoint);
+ portMapList.add(createMappingObject(nodeId, port,
+ connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(),
+ logicalConnectionPoint));
break;
case 2:
// ports are unidirectionals
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(cpMapEntry.getKey()).get(0).getPortName()
- .toString()));
- LOG.info("Fetching connection-port {} at circuit pack {}", connectionPortMap
- .get(cpMapEntry.getKey()).get(0).getPortName().toString(), cp1Name);
+ .child(Ports.class,
+ new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString()));
+ LOG.info("Fetching connection-port {} at circuit pack {}",
+ connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString(),
+ 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(cpMapEntry.getKey()).get(1).getPortName()
- .toString()));
+ .child(Ports.class,
+ new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName().toString()));
LOG.info("Fetching connection-port {} at circuit pack {}",
connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName().toString(), 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())
- && 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())
- && port2.getPartnerPort().getCircuitPackName().equals(cp1Name)
- && port2.getPartnerPort().getPortName().equals(port1.getPortName()))) {
- String logicalConnectionPoint1 = new StringBuilder("DEG").append(cpMapEntry.getKey())
- .append("-TTP-").append(port1.getPortDirection().getName().toUpperCase()).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()).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));
- } 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 {
+ if (!port1Object.isPresent() || !port2Object.isPresent()) {
LOG.error("No port {} on circuit pack {} for node {}",
connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString(),
connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), nodeId);
return false;
}
+ Ports port1 = port1Object.get();
+ Ports port2 = port2Object.get();
+ if (port1.getPortQual() == null || port2.getPortQual() == null) {
+ continue;
+ }
+ if (Port.PortQual.RoadmExternal.getIntValue() != port1.getPortQual().getIntValue()
+ || Port.PortQual.RoadmExternal.getIntValue() != port2.getPortQual().getIntValue()
+ || port1.getPartnerPort() == null
+ || port2.getPartnerPort() == null
+ || !port1.getPartnerPort().getCircuitPackName().equals(cp2Name)
+ || !port1.getPartnerPort().getPortName().equals(port2.getPortName())
+ || !port2.getPartnerPort().getCircuitPackName().equals(cp1Name)
+ || !port2.getPartnerPort().getPortName().equals(port1.getPortName())
+ || ((Direction.Rx.getIntValue() != port1.getPortDirection().getIntValue()
+ || Direction.Tx.getIntValue() != port2.getPortDirection().getIntValue())
+ && (Direction.Rx.getIntValue() != port2.getPortDirection().getIntValue()
+ || Direction.Tx.getIntValue() != port1.getPortDirection().getIntValue()))) {
+ 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);
+ 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", cpMapEntry.getKey(), nodeId);
Code Review / transportpce.git / blobdiff