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.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.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.rev210310.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.NetworkBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.NodesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.CpToDegree;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.CpToDegreeBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.CpToDegreeKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.NodeInfo;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.NodeInfo.OpenroadmVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210310.network.nodes.NodeInfoBuilder;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.Direction;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.CircuitPack;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.Port;
// FIXME: many common pieces of code between PortMapping Versions 121 and 221 and 710
// some mutualization would be helpful
+@SuppressWarnings("CPD-START")
public class PortMappingVersion121 {
private static final Logger LOG = LoggerFactory.getLogger(PortMappingVersion121.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 PortMappingVersion121(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager,
OpenRoadmInterfaces openRoadmInterfaces) {
this.dataBroker = dataBroker;
}
public boolean createMappingData(String nodeId) {
- LOG.info("Create Mapping Data for node 1.2.1 {}", nodeId);
+ LOG.info("{} : OpenROADM version 1.2.1 node - Creating Mapping Data", nodeId);
List<Mapping> portMapList = new ArrayList<>();
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);
if (!deviceInfoOptional.isPresent()) {
- LOG.warn("Device info subtree is absent for {}", nodeId);
+ LOG.warn("{} : Device info subtree is absent", nodeId);
return false;
}
Info deviceInfo = deviceInfoOptional.get();
// 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;
}
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 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;
}
Ports port = portObject.get();
Mapping newMapping = createMappingObject(nodeId, port, oldMapping.getSupportingCircuitPackName(),
oldMapping.getLogicalConnectionPoint());
- LOG.info("Updating old mapping Data {} for {} of {} by new mapping data {}",
- oldMapping, oldMapping.getLogicalConnectionPoint(), nodeId, newMapping);
+ 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))
commit.get();
return true;
} catch (InterruptedException | ExecutionException e) {
- LOG.error("Error updating Mapping {} for node {}", oldMapping.getLogicalConnectionPoint(), nodeId, e);
+ LOG.error("{} : exception when updating Mapping {} - ",
+ nodeId, oldMapping.getLogicalConnectionPoint(), e);
return false;
}
}
LogicalDatastoreType.OPERATIONAL, deviceIID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
if (!deviceObject.isPresent()) {
- LOG.error("Impossible to get device configuration for node {}", nodeId);
+ LOG.error("{} : Impossible to get device configuration", nodeId);
return false;
}
OrgOpenroadmDevice device = deviceObject.get();
if (device.getCircuitPacks() == null) {
- LOG.warn("Circuit Packs are not present for {}", nodeId);
+ LOG.warn("{} : Circuit Packs not present", nodeId);
return false;
}
// Variable to keep track of number of line ports
for (CircuitPacks cp : circuitPackList) {
String circuitPackName = cp.getCircuitPackName();
if (cp.getPorts() == null) {
- LOG.warn("Ports were not found for circuit pack: {}", circuitPackName);
+ LOG.warn("{} : Ports were not found for circuit pack {}", nodeId, circuitPackName);
continue;
}
List<Ports> portList = new ArrayList<>(cp.nonnullPorts().values());
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);
- continue;
- }
-
- 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;
- }
- 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());
- }
+ int[] counters = fillXpdrLcpsMaps(line, client, nodeId,
+ 1, circuitPackName, port,
+ circuitPackList, lcpMap, mappingMap);
+ line = counters[0];
+ client = counters[1];
}
}
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 (circuitpack+port) {}",
- skey, dkey);
+ 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;
return true;
}
- private boolean checkPartnerPort(String circuitPackName, Ports port1, Ports port2) {
- if (port2.getPartnerPort() == null
- || port2.getPartnerPort().getCircuitPackName() == null
- || port2.getPartnerPort().getPortName() == null
+ 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())
+ || !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())
&&
for (int srgCounter = 1; srgCounter <= maxSrg; srgCounter++) {
List<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.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(Uint16.valueOf(srgCounter)));
Optional<SharedRiskGroup> ordmSrgObject = this.deviceTransactionManager.getDataFromDevice(deviceId,
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;
}
}
if (Port.PortQual.RoadmExternal.getIntValue() != port.getPortQual().getIntValue()) {
- LOG.info("{} : port {} on {} is not roadm-external - cannot assign logicalConnectionPoint.",
- nodeId, port.getPortName(), circuitPackName);
+ LOG.debug("{} : 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);
+ LOG.debug("{} : port {} on {} has already been handled - cannot assign logicalConnectionPoint.",
+ nodeId, port.getPortName(), circuitPackName);
continue;
}
case Bidirectional:
String lcp = createLogicalConnectionPort(port, srgCpEntry.getKey(), portIndex);
- LOG.info("{} : Logical Connection Point for {} {} is {}",
- nodeId, circuitPackName, port.getPortName(), lcp);
+ 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);
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);
+ 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("{} : Logical Connection Point for {} {} is {}",
- nodeId, circuitPackName, port.getPortName(), lcp1);
+ 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()))
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);
+ LOG.error("{} : port {} on {} - error getting partner",
+ nodeId, port.getPartnerPort().getPortName().toString(),
+ port.getPartnerPort().getCircuitPackName());
continue;
}
Ports port2 = port2Object.get();
if (!checkPartnerPort(circuitPackName, port, port2)) {
- LOG.error("Error with partner port configuration for port {} of {} - {}",
- port.getPortName(), circuitPackName, nodeId);
+ LOG.error("{} : port {} on {} - Error with partner port configuration",
+ nodeId, port.getPortName(), circuitPackName);
portIndex++;
continue;
}
String lcp2 = createLogicalConnectionPort(port2, srgCpEntry.getKey(),portIndex);
- LOG.info("{} : Logical Connection Point for {} {} is {}",
- nodeId, circuitPackName, port2.getPortName(), lcp2);
+ 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));
break;
default:
- LOG.info("{} : port {} on {} - unsupported Direction"
+ LOG.error("{} : port {} on {} - unsupported Direction {}"
+ " - cannot assign logicalConnectionPoint.",
- nodeId, port.getPortName(), circuitPackName);
+ 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<>();
+ 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)
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(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", deviceId, 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 = ordmInfo.getMaxDegrees() == null ? 20 : ordmInfo.getMaxDegrees().toJava();
-
- 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(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()) {
- conPortMap.put(degreeCounter, new ArrayList<>(ordmDegreeObject.get()
- .nonnullConnectionPorts().values()));
- }
- }
- LOG.info("Device {} has {} degree", deviceId, conPortMap.size());
+ getDegreesMap(deviceId, ordmInfo).forEach(
+ (index, degree) -> conPortMap.put(index, new ArrayList<>(degree.nonnullConnectionPorts().values())));
return conPortMap;
}
private Map<String, String> getEthInterfaceList(String nodeId) {
- LOG.info("It is calling get ethernet interface");
+ 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) {
- LOG.warn("Couldnt find port config under LLDP for Node : {} - Processiong is done.. now returning..",
- nodeId);
+ LOG.warn("{} : Couldnt find port config under LLDP - Processiong is done.. now returning..", nodeId);
return new HashMap<>();
}
Map<String, String> cpToInterfaceMap = new HashMap<>();
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) {
- continue;
- }
- LOG.info("Inside CP to degree list");
+ 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(), nodeId, interfaceList))
+ degree.getDegreeNumber().toString(), interfaceList))
.collect(Collectors.toList()));
}
return cpToDegreeList;
}
if (portMapList != null) {
Map<MappingKey, Mapping> mappingMap = new HashMap<>();
+ // No element in the list below should be null at this stage
for (Mapping mapping: portMapList) {
- if (mapping == null) {
- continue;
- }
mappingMap.put(mapping.key(), mapping);
}
nodesBldr.setMapping(mappingMap);
}
if (cp2DegreeList != null) {
Map<CpToDegreeKey, CpToDegree> cpToDegreeMap = new HashMap<>();
+ // No element in the list below should be null at this stage
for (CpToDegree cp2Degree: cp2DegreeList) {
- if (cp2Degree == null) {
- continue;
- }
cpToDegreeMap.put(cp2Degree.key(), cp2Degree);
}
nodesBldr.setCpToDegree(cpToDegreeMap);
}
}
- private CpToDegree createCpToDegreeObject(String circuitPackName, String degreeNumber, String nodeId,
+ private CpToDegree createCpToDegreeObject(String circuitPackName, String degreeNumber,
Map<String, String> interfaceList) {
return new CpToDegreeBuilder()
.withKey(new CpToDegreeKey(circuitPackName))
.setSupportingCircuitPackName(circuitPackName)
.setSupportingPort(port.getPortName())
.setPortDirection(port.getPortDirection().getName());
-
+ if (port.getAdministrativeState() != null) {
+ mpBldr.setPortAdminState(port.getAdministrativeState().name());
+ }
+ if (port.getOperationalState() != null) {
+ mpBldr.setPortOperState(port.getOperationalState().name());
+ }
if (!logicalConnectionPoint.contains(StringConstants.TTP_TOKEN) || (port.getInterfaces() == null)) {
return mpBldr.build();
}
Optional<Interface> openRoadmInterface = this.openRoadmInterfaces.getInterface(nodeId,
interfaces.getInterfaceName());
if (!openRoadmInterface.isPresent()) {
- LOG.warn("Interface {} from node {} was null!", interfaces.getInterfaceName(), nodeId);
+ 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
mpBldr.setSupportingOts(interfaces.getInterfaceName());
}
} catch (OpenRoadmInterfaceException ex) {
- LOG.warn("Error while getting interface {} from node {}!",
- interfaces.getInterfaceName(), nodeId, ex);
+ LOG.warn("{} : Error while getting interface {} - ",
+ nodeId, interfaces.getInterfaceName(), ex);
}
}
return mpBldr.build();
if (partnerLcp != null) {
mpBldr.setPartnerLcp(partnerLcp);
}
-
+ if (port.getAdministrativeState() != null) {
+ mpBldr.setPortAdminState(port.getAdministrativeState().name());
+ }
+ if (port.getOperationalState() != null) {
+ mpBldr.setPortOperState(port.getOperationalState().name());
+ }
return mpBldr.build();
}
+ 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,
+ 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));
+ mappingMap.put(lcp2,
+ createXpdrMappingObject(nodeId, port2, circuitPackName2, lcp2, lcp1, null, null));
+ return;
+ }
+
+ private int[] fillXpdrLcpsMaps(int line, int client, String nodeId,
+ Integer xponderNb,
+ 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:
+ 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));
+ client++;
+ break;
+
+ case XpdrNetwork:
+ line = fillXpdrNetworkLcpsMaps(line, nodeId,
+ xponderNb,
+ 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,
+ 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));
+ 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,
+ 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 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);
+ List<CpToDegree> cpToDegreeList = getCpToDegreeList(degrees, interfaceList);
+ LOG.info("{} : Map looks like this {}", nodeId, interfaceList);
postPortMapping(nodeId, null, null, cpToDegreeList);
Map<Integer, List<ConnectionPorts>> connectionPortMap = getPerDegreePorts(nodeId, deviceInfo);
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());
+ 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()) {
- 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);
+ 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.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);
+ 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 {} {} is {}", nodeId,
- connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(),
- port.getPortName(), logicalConnectionPoint);
+ 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));
.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);
+ 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);
.child(CircuitPacks.class, new CircuitPacksKey(cp2Name))
.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);
+ 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);
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);
+ || Port.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;
}
.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);
+ 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));
logicalConnectionPoint2));
break;
default:
- LOG.error("Number of connection port for DEG{} on {} is incorrect", cpMapEntry.getKey(), nodeId);
+ LOG.error("{} : Number of connection port for DEG{} is incorrect", nodeId, cpMapEntry.getKey());
continue;
}
}
Code Review / transportpce.git / blobdiff