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=9eb0cf9f6048c41db228e857129f8638794782d1;hb=9732c621dfe6aa4901d2bc763a17a667a386ed07;hp=0987dfe7f3b9b1b9110ba24385b1f301c1fb646f;hpb=e4254e34b1acd2c1e5218f09828a4654601407ae;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 0987dfe7f..9eb0cf9f6 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 @@ -89,10 +89,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev191129.OtnO import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev200529.Protocols1; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev200529.lldp.container.Lldp; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev200529.lldp.container.lldp.PortConfig; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.capability.rev200529.Ports1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.capability.rev200529.port.capability.grp.port.capabilities.SupportedInterfaceCapability; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.capability.rev200529.port.capability.grp.port.capabilities.SupportedInterfaceCapabilityKey; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.SupportedIfCapability; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; @@ -421,31 +417,33 @@ public class PortMappingVersion710 { } } - if (device.getConnectionMap() != null) { + if (device.getConnectionMap() == null) { + LOG.warn("No connection-map inside device configuration"); + } else { Collection connectionMap = deviceObject.get().nonnullConnectionMap().values(); - String slcp = null; - String dlcp = null; for (ConnectionMap cm : connectionMap) { + String slcp = null; + String dlcp = null; String skey = cm.getSource().getCircuitPackName() + "+" + cm.getSource().getPortName(); if (lcpMap.containsKey(skey)) { slcp = lcpMap.get(skey); } 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); + continue; + } 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, null)); - } else { - LOG.error("Error in connection-map analysis"); - } + Mapping mapping = mappingMap.get(slcp); + mappingMap.remove(slcp); + portMapList.add(createXpdrMappingObject(nodeId, null, null, null, null, mapping, dlcp, null)); } - } else { - LOG.warn("No connection-map inside device configuration"); } + if (device.getOduSwitchingPools() != null) { Collection oduSwithcingPools = device.nonnullOduSwitchingPools().values(); List switchingPoolList = new ArrayList<>(); @@ -880,24 +878,12 @@ public class PortMappingVersion710 { } private List createMcCapDegreeObject(List degrees, - Map mcCapabilityProfileMap, String nodeId) { + Map mcCapabilityProfileMap, String nodeId) { + List mcCapabilitiesList = new ArrayList<>(); for (Degree degree : degrees) { - if (!degree.getMcCapabilityProfileName().isEmpty()) { - for (String mcCapabilityProfileName : degree.getMcCapabilityProfileName()) { - McCapabilityProfileKey mcKey = new McCapabilityProfileKey(mcCapabilityProfileName); - McCapabilityProfile mcCapabilityProfile = mcCapabilityProfileMap.get(mcKey); - String mcNodeName = "DEG" + degree.getDegreeNumber().toString() + "-TTP-" + mcCapabilityProfile; - McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() - .withKey(new McCapabilitiesKey(mcNodeName)) - .setMcNodeName(mcNodeName); - mcCapabilitiesBuilder - .setCenterFreqGranularity(mcCapabilityProfile.getCenterFreqGranularity()) - .setSlotWidthGranularity(mcCapabilityProfile.getSlotWidthGranularity()); - mcCapabilitiesList.add(mcCapabilitiesBuilder.build()); - } // end for - } - else { + + 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()); @@ -908,30 +894,34 @@ public class PortMappingVersion710 { mcCapabilitiesBuilder .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance("50")) .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance("50")); + mcCapabilitiesList.add(mcCapabilitiesBuilder.build()); + continue; + } + + for (String mcCapabilityProfileName : degree.getMcCapabilityProfileName()) { + McCapabilityProfileKey mcKey = new McCapabilityProfileKey(mcCapabilityProfileName); + McCapabilityProfile mcCapabilityProfile = mcCapabilityProfileMap.get(mcKey); + String mcNodeName = "DEG" + degree.getDegreeNumber().toString() + "-TTP-" + mcCapabilityProfile; + McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() + .withKey(new McCapabilitiesKey(mcNodeName)) + .setMcNodeName(mcNodeName); + mcCapabilitiesBuilder + .setCenterFreqGranularity(mcCapabilityProfile.getCenterFreqGranularity()) + .setSlotWidthGranularity(mcCapabilityProfile.getSlotWidthGranularity()); + mcCapabilitiesList.add(mcCapabilitiesBuilder.build()); } + } return mcCapabilitiesList; } private List createMcCapSrgObject(List srgs, - Map mcCapabilityProfileMap, String nodeId) { + Map mcCapabilityProfileMap, String nodeId) { + List mcCapabilitiesList = new ArrayList<>(); for (SharedRiskGroup srg : srgs) { - if (!srg.getMcCapabilityProfileName().isEmpty()) { - for (String mcCapabilityProfileName : srg.getMcCapabilityProfileName()) { - McCapabilityProfileKey mcKey = new McCapabilityProfileKey(mcCapabilityProfileName); - McCapabilityProfile mcCapabilityProfile = mcCapabilityProfileMap.get(mcKey); - String mcNodeName = "SRG" + srg.getSrgNumber().toString() + "-PP-" + mcCapabilityProfile; - McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() - .withKey(new McCapabilitiesKey(mcNodeName)) - .setMcNodeName(mcNodeName); - mcCapabilitiesBuilder - .setCenterFreqGranularity(mcCapabilityProfile.getCenterFreqGranularity()) - .setSlotWidthGranularity(mcCapabilityProfile.getSlotWidthGranularity()); - mcCapabilitiesList.add(mcCapabilitiesBuilder.build()); - } // end for - } - else { + + 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()); @@ -942,6 +932,21 @@ public class PortMappingVersion710 { mcCapabilitiesBuilder .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance("50")) .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance("50")); + mcCapabilitiesList.add(mcCapabilitiesBuilder.build()); + continue; + } + + for (String mcCapabilityProfileName : srg.getMcCapabilityProfileName()) { + McCapabilityProfileKey mcKey = new McCapabilityProfileKey(mcCapabilityProfileName); + McCapabilityProfile mcCapabilityProfile = mcCapabilityProfileMap.get(mcKey); + String mcNodeName = "SRG" + srg.getSrgNumber().toString() + "-PP-" + mcCapabilityProfile; + McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder() + .withKey(new McCapabilitiesKey(mcNodeName)) + .setMcNodeName(mcNodeName); + mcCapabilitiesBuilder + .setCenterFreqGranularity(mcCapabilityProfile.getCenterFreqGranularity()) + .setSlotWidthGranularity(mcCapabilityProfile.getSlotWidthGranularity()); + mcCapabilitiesList.add(mcCapabilitiesBuilder.build()); } } return mcCapabilitiesList; @@ -1012,9 +1017,6 @@ public class PortMappingVersion710 { if (ports.getPortQual() != null) { mpBldr.setPortQual(ports.getPortQual().getName()); } - if (ports.augmentation(Ports1.class).getPortCapabilities().getSupportedInterfaceCapability() != null) { - mpBldr.setSupportedInterfaceCapability(getSupportedIfCapability(ports)); - } if (xpdrNodeType != null) { mpBldr.setXponderType(xpdrNodeType); } @@ -1024,16 +1026,6 @@ public class PortMappingVersion710 { return mpBldr.build(); } - - private List> getSupportedIfCapability(Ports ports) { - Map supportedInterfaceCapabilityMap = - ports.augmentation(Ports1.class).getPortCapabilities().getSupportedInterfaceCapability(); - List> supportedInterfaceCapabilityList = new ArrayList<>(); - - supportedInterfaceCapabilityMap.forEach((k, v) -> supportedInterfaceCapabilityList.add(k.getIfCapType())); - return supportedInterfaceCapabilityList; - } - private boolean createMcCapabilitiesList(String nodeId, Info deviceInfo, List mcCapabilitiesList) { List degrees = getDegrees(nodeId, deviceInfo); List srgs = getSrgs(nodeId, deviceInfo);