X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fcommon%2Fmapping%2FPortMappingVersion710.java;h=0d4df3040c4e41d620f06df18faac69613f1a239;hb=9d49e1da85f9e18f8682f6ebdb502390b3a81d3e;hp=89a6d4c423657a18075c9db8aa8d5b69fe1a34d8;hpb=171e8320ff64ecf789d0e48172ee4c72e5490d66;p=transportpce.git diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java index 89a6d4c42..0d4df3040 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java @@ -120,7 +120,7 @@ public class PortMappingVersion710 { } public boolean createMappingData(String nodeId) { - LOG.info("Create Mapping Data for node 7.1.0 {}", nodeId); + LOG.info("{} : OpenROADM version 7.1.0 node - Creating Mapping Data", nodeId); List portMapList = new ArrayList<>(); List mcCapabilitiesList = new ArrayList<>(); InstanceIdentifier infoIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child(Info.class); @@ -128,7 +128,7 @@ public class PortMappingVersion710 { 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(); @@ -144,31 +144,31 @@ public class PortMappingVersion710 { // 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, mcCapabilitiesList)) { // return false if MC capabilites failed - LOG.warn("Unable to create MC capabilities on node {}", nodeId); + 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; } @@ -193,8 +193,8 @@ public class PortMappingVersion710 { 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 mapIID = InstanceIdentifier.create(Network.class) .child(Nodes.class, new NodesKey(nodeId)) @@ -204,7 +204,8 @@ public class PortMappingVersion710 { 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; } } @@ -216,12 +217,12 @@ public class PortMappingVersion710 { 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; } @@ -230,7 +231,7 @@ public class PortMappingVersion710 { List circuitPackList = new ArrayList<>(device.nonnullCircuitPacks().values()); circuitPackList.sort(Comparator.comparing(CircuitPack::getCircuitPackName)); if (device.getXponder() == null) { - LOG.warn("{} configuration does not contain a list of xponders", nodeId); + 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; @@ -239,21 +240,22 @@ public class PortMappingVersion710 { 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 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); + LOG.warn("{} : port {} on {} - PortQual was not found", + nodeId, port.getPortName(), circuitPackName); continue; } switch (port.getPortQual()) { case XpdrClient: + case SwitchClient: String lcp0 = createXpdrLogicalConnectionPort(1, client, StringConstants.CLIENT_TOKEN); lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp0); mappingMap.put(lcp0, @@ -263,41 +265,51 @@ public class PortMappingVersion710 { break; case XpdrNetwork: - if (port.getPortDirection().getIntValue() == Direction.Bidirectional.getIntValue()) { - String lcp = createXpdrLogicalConnectionPort(1, line, StringConstants.NETWORK_TOKEN); - lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp); - mappingMap.put(lcp, - createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, null, null) - ); - line++; - continue; - } - - - 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 - continue; + case SwitchNetwork: + switch (port.getPortDirection()) { + + case Bidirectional: + String lcp = + createXpdrLogicalConnectionPort(1, line, StringConstants.NETWORK_TOKEN); + lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp); + mappingMap.put(lcp, + createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, 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 + continue; + } + + putXpdrLcpsInMaps(line, nodeId, 1, null, + circuitPackName, circuitPackName2.toString(), port, port2, + lcpMap, mappingMap); + line += 2; + break; + + default: + LOG.error("{} : port {} on {} - unsupported Direction {}", + nodeId, port.getPortName(), circuitPackName, port.getPortDirection()); } - - putXpdrLcpsInMaps(line, nodeId, 1, null, - circuitPackName, circuitPackName2.toString(), port, port2, - lcpMap, mappingMap); - line += 2; break; default: - LOG.warn( - "Error in the configuration of port {} of {} for {} - unsupported PortQual {}", - port.getPortName(), circuitPackName, nodeId, port.getPortQual().getIntValue()); + LOG.error("{} : port {} on {} - unsupported PortQual {}", + nodeId, port.getPortName(), circuitPackName, port.getPortQual()); } } } } else { - LOG.info("{} configuration contains a list of xponders", nodeId); + 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; @@ -312,8 +324,8 @@ public class PortMappingVersion710 { 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", - circuitPackName); + LOG.warn("{} : Circuit-pack {} is missing in the device - ignoring it in port-mapping", + nodeId, circuitPackName); continue; } if (device.nonnullCircuitPacks().values().stream() @@ -321,8 +333,8 @@ public class PortMappingVersion710 { .findFirst().get().nonnullPorts().values().stream() .filter(p -> p.getPortName().equals(portName)) .findFirst().isEmpty()) { - LOG.warn("Port {} associated with CP {} is missing in the device - ignoring it in port-mapping", - portName, circuitPackName); + LOG.warn("{} : port {} on {} - association missing in the device - ignoring it in port-mapping", + nodeId, portName, circuitPackName); continue; } Ports port = device.nonnullCircuitPacks().values().stream() @@ -331,8 +343,8 @@ public class PortMappingVersion710 { .filter(p -> p.getPortName().equals(portName)) .findFirst().get(); if (port.getPortQual() == null) { - LOG.warn("PortQual was not found for port {} on circuit pack: {}", - port.getPortName(), circuitPackName); + LOG.warn("{} : port {} on {} - PortQual was not found", + nodeId, port.getPortName(), circuitPackName); continue; } @@ -351,43 +363,51 @@ public class PortMappingVersion710 { case XpdrNetwork: case SwitchNetwork: - if (port.getPortDirection().getIntValue() == Direction.Bidirectional.getIntValue()) { - 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++; - continue; + 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 + continue; + } + + 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()); } - - 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 - continue; - } - - putXpdrLcpsInMaps(line, nodeId, xponderNb, xponderType, - circuitPackName, circuitPackName2.toString(), port, port2, - lcpMap, mappingMap); - line += 2; break; default: - LOG.warn( - "Error in the configuration of port {} of {} for {} - unsupported PortQual {}", - port.getPortName(), circuitPackName, nodeId, port.getPortQual().getIntValue()); + LOG.error("{} : port {} on {} - unsupported PortQual {}", + nodeId, port.getPortName(), circuitPackName, port.getPortQual()); } } } } if (device.getConnectionMap() == null) { - LOG.warn("No connection-map inside device configuration"); + LOG.warn("{} : No connection-map inside device configuration", nodeId); } else { Collection connectionMap = deviceObject.get().nonnullConnectionMap().values(); for (ConnectionMap cm : connectionMap) { @@ -396,8 +416,8 @@ public class PortMappingVersion710 { 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; @@ -421,8 +441,8 @@ public class PortMappingVersion710 { for (PortList item : nbl.nonnullPortList().values()) { String key = item.getCircuitPackName() + "+" + item.getPortName(); if (!lcpMap.containsKey(key)) { - LOG.error("error : port {} of {} is not associated to a logical connection point", - item.getPortName(), item.getCircuitPackName()); + LOG.error("{} : port {} on {} is not associated to a logical connection point", + nodeId, item.getPortName(), item.getCircuitPackName()); continue; } lcpList.add(lcpMap.get(key)); @@ -493,7 +513,7 @@ public class PortMappingVersion710 { for (int srgCounter = 1; srgCounter <= maxSrg; srgCounter++) { List srgCps = new ArrayList<>(); - LOG.info("Getting Circuitpacks for Srg Number {}", srgCounter); + LOG.debug("{} : Getting Circuitpacks for Srg Number {}", deviceId, srgCounter); InstanceIdentifier srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(srgCounter))); Optional ordmSrgObject = this.deviceTransactionManager.getDataFromDevice(deviceId, @@ -504,7 +524,7 @@ public class PortMappingVersion710 { 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; } @@ -539,14 +559,14 @@ public class PortMappingVersion710 { } if (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; } @@ -554,8 +574,8 @@ public class PortMappingVersion710 { 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); @@ -565,14 +585,14 @@ public class PortMappingVersion710 { case Tx: if (!checkPartnerPortNotNull(port)) { LOG.info("{} : port {} on {} is unidirectional but has no valid partnerPort" - + " - cannot assign logicalConnectionPoint.", - nodeId, port.getPortName(), circuitPackName); + + " - 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 port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(CircuitPacks.class, new CircuitPacksKey(port.getPartnerPort().getCircuitPackName())) @@ -583,22 +603,22 @@ public class PortMappingVersion710 { if (!port2Object.isPresent() || port2Object.get().getPortQual().getIntValue() != 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)); @@ -608,9 +628,9 @@ public class PortMappingVersion710 { 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()); } } @@ -659,7 +679,7 @@ public class PortMappingVersion710 { 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 deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(Degree.class, new DegreeKey(Uint16.valueOf(degreeCounter))); Optional ordmDegreeObject = this.deviceTransactionManager.getDataFromDevice(deviceId, @@ -669,7 +689,7 @@ public class PortMappingVersion710 { degrees.put(degreeCounter, ordmDegreeObject.get()); } } - LOG.info("Device {} has {} degree", deviceId, degrees.size()); + LOG.info("{} : Device has {} degree(s)", deviceId, degrees.size()); return degrees; } @@ -701,15 +721,14 @@ public class PortMappingVersion710 { } private Map getEthInterfaceList(String nodeId) { - LOG.info("It is calling get ethernet interface"); + LOG.info("{} : It is calling get ethernet interface", nodeId); InstanceIdentifier protocoliid = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(Protocols.class); Optional 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 cpToInterfaceMap = new HashMap<>(); @@ -739,14 +758,14 @@ public class PortMappingVersion710 { 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 getCpToDegreeList(Map degrees, Map interfaceList) { List cpToDegreeList = new ArrayList<>(); for (Degree degree : degrees.values()) { - LOG.info("Inside CP to degree list"); + LOG.debug("Inside CP to degree list"); cpToDegreeList.addAll(degree.nonnullCircuitPacks().values().stream() .map(cp -> createCpToDegreeObject(cp.getCircuitPackName(), degree.getDegreeNumber().toString(), interfaceList)) @@ -758,16 +777,15 @@ public class PortMappingVersion710 { private List getMcCapabilitiesList(Map degrees, List srgs, Info deviceInfo, String nodeId) { //TODO some divergences with 2.2.1 here - LOG.info("Getting the MC capabilities for degrees of node {}", nodeId); + LOG.info("{} : Getting the MC capabilities for degrees", nodeId); //Get all the mc-capability profiles from the device Map mcCapabilityProfiles = getMcCapabilityProfiles(nodeId, deviceInfo); // Add the DEG mc-capabilities List mcCapabilitiesList = createMcCapDegreeObject(degrees, mcCapabilityProfiles, nodeId); // Add the SRG mc-capabilities - LOG.info("Getting the MC capabilities for SRGs of node {}", nodeId); + LOG.info("{} : Getting the MC capabilities for SRGs", nodeId); mcCapabilitiesList.addAll(createMcCapSrgObject(srgs, mcCapabilityProfiles, nodeId)); - return mcCapabilitiesList; } @@ -819,7 +837,7 @@ public class PortMappingVersion710 { 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; } } @@ -840,9 +858,9 @@ public class PortMappingVersion710 { for (Degree degree : degrees.values()) { if ((degree.getMcCapabilityProfileName() == null) || (degree.getMcCapabilityProfileName().isEmpty())) { - LOG.warn("No MC profiles are found for node {} on degree {}", nodeId, degree.getDegreeNumber()); - LOG.warn("Assuming the fixed grid capabilities for degree {}", degree.getDegreeNumber()); - LOG.warn("Assuming a default MC profile-name for degree {}", degree.getDegreeNumber()); + LOG.warn("{} : No MC profiles are found on degree {} - " + + "assuming the fixed grid capabilities and a default profile-name", + nodeId, degree.getDegreeNumber()); String mcNodeName = "DEG" + degree.getDegreeNumber().toString() + "-TTP-" + "default-profile"; McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() .withKey(new McCapabilitiesKey(mcNodeName)) @@ -878,9 +896,9 @@ public class PortMappingVersion710 { for (SharedRiskGroup srg : srgs) { if ((srg.getMcCapabilityProfileName() == null) || (srg.getMcCapabilityProfileName().isEmpty())) { - LOG.warn("No MC profiles are found for node {} on SRG {}", nodeId, srg.getSrgNumber()); - LOG.warn("Assuming the fixed grid capabilities for SRG {}", srg.getSrgNumber()); - LOG.warn("Assuming a default MC profile-name for SRG {}", srg.getSrgNumber()); + LOG.warn("{} : No MC profiles are found on SRG {} - " + + "assuming the fixed grid capabilities and a default MC profile-name", + nodeId, srg.getSrgNumber()); String mcNodeName = "SRG" + srg.getSrgNumber().toString() + "-PP-" + "default-profile"; McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() .withKey(new McCapabilitiesKey(mcNodeName)) @@ -928,11 +946,11 @@ public class PortMappingVersion710 { Optional 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.info("interface get from device is {} and of type {}", - openRoadmInterface.get().getName(), openRoadmInterface.get().getType()); + LOG.debug("{} : interface get from device is {} and of type {}", + nodeId, openRoadmInterface.get().getName(), openRoadmInterface.get().getType()); Class interfaceType = (Class) openRoadmInterface.get().getType(); // Check if interface type is OMS or OTS @@ -946,8 +964,8 @@ public class PortMappingVersion710 { mpBldr.setSupportingOdu4(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(); @@ -988,8 +1006,8 @@ public class PortMappingVersion710 { //circuitPackName2 will be updated by reference contrary to circuitPackName List circuitPackList, Map lcpMap) { if (!checkPartnerPortNotNull(port)) { - LOG.warn("Error in the configuration of port {} of {} for {}", - port.getPortName(), circuitPackName, nodeId); + LOG.warn("{} : port {} on {} - Error in the configuration ", + nodeId, port.getPortName(), circuitPackName); return null; } if (lcpMap.containsKey(circuitPackName + '+' + port.getPortName())) { @@ -1000,23 +1018,23 @@ public class PortMappingVersion710 { cP -> cP.getCircuitPackName().equals(port.getPartnerPort().getCircuitPackName())) .findFirst(); if (!cpOpt.isPresent()) { - LOG.error("Error fetching circuit-pack {} for {}", - port.getPartnerPort().getCircuitPackName(), nodeId); + LOG.error("{} : Error fetching circuit-pack {}", + nodeId, port.getPartnerPort().getCircuitPackName()); return null; } Optional 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); + 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 {}", - port2.getPortName(), circuitPackName2, port.getPortName(), circuitPackName); + LOG.error("{} : port {} on {} is not a correct partner port of {} on {}", + nodeId, port2.getPortName(), circuitPackName2, port.getPortName(), circuitPackName); return null; } return port2; @@ -1030,7 +1048,7 @@ public class PortMappingVersion710 { 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 {}", lcp1, lcp2); + LOG.warn("{} : mapping already exists for {} or {}", nodeId, lcp1, lcp2); return; } lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1); @@ -1055,7 +1073,7 @@ public class PortMappingVersion710 { Map degrees = getDegreesMap(nodeId, deviceInfo); Map interfaceList = getEthInterfaceList(nodeId); List cpToDegreeList = getCpToDegreeList(degrees, interfaceList); - LOG.info("Map looks like this {}", interfaceList); + LOG.info("{} : Map looks like this {}", nodeId, interfaceList); postPortMapping(nodeId, null, null, cpToDegreeList, null, null); Map> connectionPortMap = getPerDegreePorts(nodeId, deviceInfo); @@ -1068,16 +1086,18 @@ public class PortMappingVersion710 { 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 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(); @@ -1086,19 +1106,20 @@ public class PortMappingVersion710 { } if (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 {}" + LOG.error("{} : port {} on {} - Impossible to create logical connection point" + " - Error in configuration with port-qual or port-direction", - port.getPortName(), - connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), nodeId); + 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)); @@ -1111,9 +1132,8 @@ public class PortMappingVersion710 { .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 port1Object = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, port1ID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); @@ -1121,15 +1141,16 @@ public class PortMappingVersion710 { .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 port2Object = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, port2ID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); 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); + LOG.error("{} : No port {} on circuit pack {}", + nodeId, + connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), + connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName()); return false; } @@ -1140,20 +1161,20 @@ public class PortMappingVersion710 { } 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 {} on node {}" + LOG.error("{} : Impossible to create logical connection point for port {} or port {}" + " - Error in configuration with port-qual", - port1.getPortName(), port2.getPortName(), nodeId); + nodeId, port1.getPortName(), port2.getPortName()); continue; } if (!checkPartnerPort(cp1Name, port1, port2)) { - LOG.error("port {} on {} is not a correct partner port of {} on {}", - port2.getPortName(), cp2Name, port1.getPortName(), cp1Name); + 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 {}", - port1.getPortName(), cp1Name, port2.getPortName(), cp2Name); + LOG.error("{} : port {} on {} is not a correct partner port of {} on {}", + nodeId, port1.getPortName(), cp1Name, port2.getPortName(), cp2Name); continue; } @@ -1173,15 +1194,16 @@ public class PortMappingVersion710 { .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); + 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); + LOG.error("{} : Number of connection port for DEG{} is incorrect", nodeId, cpMapEntry.getKey()); continue; } }