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.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
+import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.transportpce.common.StringConstants;
import org.opendaylight.transportpce.common.Timeouts;
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.rev210426.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.NetworkBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.OpenroadmNodeVersion;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.cp.to.degree.CpToDegree;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.cp.to.degree.CpToDegreeBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.cp.to.degree.CpToDegreeKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mapping.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mapping.MappingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mapping.MappingKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mc.capabilities.McCapabilities;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mc.capabilities.McCapabilitiesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mc.capabilities.McCapabilitiesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.mpdr.restrictions.grp.MpdrRestrictionsBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.network.NodesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.network.nodes.NodeInfo;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.network.nodes.NodeInfoBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.switching.pool.lcp.SwitchingPoolLcp;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.switching.pool.lcp.SwitchingPoolLcpBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.switching.pool.lcp.SwitchingPoolLcpKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.switching.pool.lcp.switching.pool.lcp.NonBlockingList;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.switching.pool.lcp.switching.pool.lcp.NonBlockingListBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.switching.pool.lcp.switching.pool.lcp.NonBlockingListKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.NetworkBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.OpenroadmNodeVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.cp.to.degree.CpToDegree;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.cp.to.degree.CpToDegreeBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.cp.to.degree.CpToDegreeKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mapping.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mapping.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mapping.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mc.capabilities.McCapabilities;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mc.capabilities.McCapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mc.capabilities.McCapabilitiesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mpdr.restrictions.grp.MpdrRestrictionsBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.network.NodesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.network.nodes.NodeInfo;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.network.nodes.NodeInfoBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.regen.profiles.grp.RegenProfilesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.switching.pool.lcp.SwitchingPoolLcp;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.switching.pool.lcp.SwitchingPoolLcpBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.switching.pool.lcp.SwitchingPoolLcpKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.switching.pool.lcp.switching.pool.lcp.NonBlockingList;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.switching.pool.lcp.switching.pool.lcp.NonBlockingListBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.switching.pool.lcp.switching.pool.lcp.NonBlockingListKey;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.alarm.pm.types.rev191129.Direction;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.optical.channel.types.rev200529.FrequencyGHz;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.CircuitPack;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.OrgOpenroadmDeviceData;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.pack.Ports;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.pack.PortsKey;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.circuit.packs.CircuitPacks;
import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev191129.OpenROADMOpticalMultiplex;
import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev191129.OpticalTransport;
import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev191129.OtnOdu;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev191129.OtnOtu;
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.otn.common.types.rev200327.OpucnTribSlotDef;
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.capability.rev200529.port.capability.grp.port.capabilities.supported._interface.capability.otn.capability.MpdrClientRestriction;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
import org.opendaylight.yangtools.yang.common.Uint16;
private static final Logger LOG = LoggerFactory.getLogger(PortMappingVersion710.class);
private static final Map<Direction, String> SUFFIX;
+ private static final Set<Integer> TXRX_SET = Set.of(Direction.Tx.getIntValue(), Direction.Rx.getIntValue());
private final DataBroker dataBroker;
private final DeviceTransactionManager deviceTransactionManager;
- private final OpenRoadmInterfaces openRoadmInterfaces;
static {
SUFFIX = Map.of(
Direction.Bidirectional, "TXRX");
}
- public PortMappingVersion710(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager,
- OpenRoadmInterfaces openRoadmInterfaces) {
+ public PortMappingVersion710(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager) {
this.dataBroker = dataBroker;
this.deviceTransactionManager = deviceTransactionManager;
- this.openRoadmInterfaces = openRoadmInterfaces;
}
public boolean createMappingData(String nodeId) {
LOG.info(PortMappingUtils.CREATE_MAPPING_DATA_LOGMSG, nodeId, "7.1");
List<Mapping> portMapList = new ArrayList<>();
Map<McCapabilitiesKey, McCapabilities> mcCapabilities = new HashMap<>();
- InstanceIdentifier<Info> infoIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child(Info.class);
+ InstanceIdentifier<Info> infoIID = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .child(Info.class)
+ .build();
Optional<Info> deviceInfoOptional = this.deviceTransactionManager.getDataFromDevice(
nodeId, LogicalDatastoreType.OPERATIONAL, infoIID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
LOG.warn(PortMappingUtils.DEVICE_HAS_LOGMSG, nodeId, "no info", "subtree");
return false;
}
- Info deviceInfo = deviceInfoOptional.get();
+ Info deviceInfo = deviceInfoOptional.orElseThrow();
NodeInfo nodeInfo = createNodeInfo(deviceInfo);
if (nodeInfo == null) {
return false;
// Get TTP port mapping
if (!createTtpPortMapping(nodeId, deviceInfo, portMapList)) {
// return false if mapping creation for TTP's failed
- LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, "create", "TTP's");
+ LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, PortMappingUtils.CREATE, "TTP's");
return false;
}
// Get PP port mapping
if (!createPpPortMapping(nodeId, deviceInfo, portMapList)) {
// return false if mapping creation for PP's failed
- LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, "create", "PP's");
+ LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, PortMappingUtils.CREATE, "PP's");
return false;
}
// Get MC capabilities
break;
case Xpdr:
if (!createXpdrPortMapping(nodeId, portMapList)) {
- LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, "create", "Xponder");
+ LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, PortMappingUtils.CREATE, "Xponder");
return false;
}
// In the case of 7.1 models, even XPDR advertizes mc-capabilities,
break;
default:
LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG,
- nodeId, "create", deviceInfo.getNodeType() + " - unknown nodetype");
+ nodeId, PortMappingUtils.CREATE, deviceInfo.getNodeType() + " - unknown nodetype");
break;
}
public boolean updateMapping(String nodeId, Mapping oldMapping) {
if (nodeId == null) {
- LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG, "node id null" , "update", "a null value");
+ LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG, "node id null" , PortMappingUtils.UPDATE, "a null value");
return false;
}
if (oldMapping == null) {
- LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, "update", "a null value");
+ LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, PortMappingUtils.UPDATE, "a null value");
return false;
}
- InstanceIdentifier<Ports> portId = InstanceIdentifier.create(OrgOpenroadmDevice.class)
+ InstanceIdentifier<Ports> portId = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
.child(CircuitPacks.class, new CircuitPacksKey(oldMapping.getSupportingCircuitPackName()))
- .child(Ports.class, new PortsKey(oldMapping.getSupportingPort()));
+ .child(Ports.class, new PortsKey(oldMapping.getSupportingPort()))
+ .build();
try {
Ports port = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL,
- portId, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).get();
+ portId, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).orElseThrow();
Mapping newMapping = updateMappingObject(nodeId, port, oldMapping);
LOG.debug(PortMappingUtils.UPDATE_MAPPING_LOGMSG,
nodeId, oldMapping, oldMapping.getLogicalConnectionPoint(), newMapping);
return true;
} catch (InterruptedException | ExecutionException e) {
LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG,
- nodeId, "update", oldMapping.getLogicalConnectionPoint(), e);
+ nodeId, PortMappingUtils.UPDATE, oldMapping.getLogicalConnectionPoint(), e);
return false;
}
}
public boolean updatePortMappingWithOduSwitchingPools(String nodeId, InstanceIdentifier<OduSwitchingPools> ospIID,
Map<Uint16, List<InstanceIdentifier<PortList>>> nbliidMap) {
- KeyedInstanceIdentifier<Nodes, NodesKey> portMappingNodeIID = InstanceIdentifier.create(Network.class)
- .child(Nodes.class, new NodesKey(nodeId));
+ KeyedInstanceIdentifier<Nodes, NodesKey> portMappingNodeIID =
+ InstanceIdentifier.create(Network.class).child(Nodes.class, new NodesKey(nodeId));
Nodes portmappingNode = null;
try (ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction()) {
- portmappingNode = readTx.read(LogicalDatastoreType.CONFIGURATION, portMappingNodeIID).get().get();
+ portmappingNode = readTx.read(LogicalDatastoreType.CONFIGURATION, portMappingNodeIID).get().orElseThrow();
} catch (InterruptedException | ExecutionException ex) {
LOG.error("Unable to read the port-mapping for nodeId {}", nodeId, ex);
}
if (portmappingNode == null) {
return false;
}
- Map<MappingKey, Mapping> mappings = portmappingNode.nonnullMapping();
OduSwitchingPools osp = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL,
- ospIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).get();
+ ospIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).orElseThrow();
Uint16 ospNumber = osp.getSwitchingPoolNumber();
Map<SwitchingPoolLcpKey, SwitchingPoolLcp> splMap =
new HashMap<SwitchingPoolLcpKey, SwitchingPoolLcp>(portmappingNode.nonnullSwitchingPoolLcp());
.setSwitchingPoolType(osp.getSwitchingPoolType());
Map<NonBlockingListKey, NonBlockingList> nblMap = new HashMap<>();
for (Entry<Uint16, List<InstanceIdentifier<PortList>>> entry : nbliidMap.entrySet()) {
- Uint32 interconnectBw = osp.getNonBlockingList().get(new
- org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org
- .openroadm.device.odu.switching.pools.NonBlockingListKey(entry.getKey()))
- .getInterconnectBandwidth();
- NonBlockingList nbl = createNonBlockingList(splBldr, interconnectBw, entry, mappings, nodeId);
+ NonBlockingList nbl = createNonBlockingList(
+ splBldr,
+ osp.getNonBlockingList()
+ .get(new org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529
+ .org.openroadm.device.container.org.openroadm.device.odu.switching.pools
+ .NonBlockingListKey(entry.getKey()))
+ .getInterconnectBandwidth(),
+ entry,
+ portmappingNode.nonnullMapping(),
+ nodeId);
if (nbl == null) {
return false;
}
nblMap.put(nbl.key(), nbl);
}
- SwitchingPoolLcp switchingPoolLcp = splBldr
- .setNonBlockingList(nblMap)
- .build();
+ SwitchingPoolLcp switchingPoolLcp = splBldr.setNonBlockingList(nblMap).build();
splMap.put(switchingPoolLcp.key(), switchingPoolLcp);
- List<SwitchingPoolLcp> switchingPoolList = new ArrayList<>(splMap.values());
- postPortMapping(nodeId, null, null, null, switchingPoolList, null);
+ postPortMapping(nodeId, null, null, null, new ArrayList<SwitchingPoolLcp>(splMap.values()), null);
return true;
}
private NonBlockingList createNonBlockingList(SwitchingPoolLcpBuilder splBldr, Uint32 interconnectBw,
Entry<Uint16, List<InstanceIdentifier<PortList>>> entry, Map<MappingKey, Mapping> mappings, String nodeId) {
- NonBlockingListBuilder nblBldr;
- if (splBldr.getNonBlockingList() != null
- && splBldr.getNonBlockingList().containsKey(new NonBlockingListKey(entry.getKey()))) {
- nblBldr = new NonBlockingListBuilder(splBldr.getNonBlockingList()
- .get(new NonBlockingListKey(entry.getKey())));
- } else {
- nblBldr = new NonBlockingListBuilder()
- .setNblNumber(entry.getKey())
- .setInterconnectBandwidth(interconnectBw);
- }
- List<String> lcpList = nblBldr.getLcpList() != null ? nblBldr.getLcpList() : new ArrayList<>();
+ NonBlockingListBuilder nblBldr = splBldr.getNonBlockingList() == null
+ || !splBldr.getNonBlockingList().containsKey(new NonBlockingListKey(entry.getKey()))
+ ? new NonBlockingListBuilder().setNblNumber(entry.getKey()).setInterconnectBandwidth(interconnectBw)
+ : new NonBlockingListBuilder(splBldr.getNonBlockingList().get(new NonBlockingListKey(entry.getKey())));
+ Set<String> lcpList = nblBldr.getLcpList() != null ? nblBldr.getLcpList() : new HashSet<>();
for (InstanceIdentifier<PortList> id : entry.getValue()) {
PortList portList = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL,
- id, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).get();
- String circuitPackName = portList.getCircuitPackName();
- String portName = portList.getPortName();
- String lcp = getLcpFromCpAndPort(mappings, circuitPackName, portName);
- if (lcp != null && !lcpList.contains(lcp)) {
- lcpList.add(lcp);
- } else {
+ id, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).orElseThrow();
+ String lcp = getLcpFromCpAndPort(mappings, portList.getCircuitPackName(), portList.getPortName());
+ if (lcp == null || lcpList.contains(lcp)) {
return null;
}
+ lcpList.add(lcp);
}
- nblBldr.setLcpList(lcpList);
- return nblBldr.build();
+ return nblBldr.setLcpList(lcpList).build();
}
private boolean createXpdrPortMapping(String nodeId, List<Mapping> portMapList) {
// Creating for Xponder Line and Client Ports
- InstanceIdentifier<OrgOpenroadmDevice> deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class);
+ OrgOpenroadmDevice device = getXpdrDevice(nodeId);
+ if (device == null) {
+ return false;
+ }
+ Map<String, String> lcpMap = new HashMap<>();
+ Map<String, Mapping> mappingMap = new HashMap<>();
+ getXpdrMaps(device, nodeId, lcpMap, mappingMap);
+ if (device.getConnectionMap() == null) {
+ LOG.warn(PortMappingUtils.NO_CONMAP_LOGMSG, nodeId);
+ } else {
+ for (ConnectionMap cm : device.nonnullConnectionMap().values()) {
+ String skey = cm.getSource().getCircuitPackName() + "+" + cm.getSource().getPortName();
+ Destination destination0 = cm.nonnullDestination().values().iterator().next();
+ String dkey = destination0.getCircuitPackName() + "+" + destination0.getPortName();
+ if (!lcpMap.containsKey(skey)) {
+ LOG.error(PortMappingUtils.CONMAP_ISSUE_LOGMSG, nodeId, skey, dkey);
+ continue;
+ }
+ String slcp = lcpMap.get(skey);
+ Mapping mapping = mappingMap.get(slcp);
+ mappingMap.remove(slcp);
+ portMapList.add(createXpdrMappingObject(nodeId, null, null, null, null, mapping,
+ //dlcp
+ lcpMap.containsKey(dkey) ? lcpMap.get(dkey) : null,
+ null));
+ }
+ }
+ if (device.getOduSwitchingPools() != null) {
+ postPortMapping(nodeId, null, null, null, getSwitchingPoolList(device, lcpMap, nodeId), null);
+ }
+ mappingMap.forEach((k,v) -> portMapList.add(v));
+ return true;
+ }
+
+ private OrgOpenroadmDevice getXpdrDevice(String nodeId) {
+ InstanceIdentifier<OrgOpenroadmDevice> deviceIID = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .build();
Optional<OrgOpenroadmDevice> deviceObject = deviceTransactionManager.getDataFromDevice(nodeId,
LogicalDatastoreType.OPERATIONAL, deviceIID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- if (!deviceObject.isPresent()) {
+ if (deviceObject.isEmpty()) {
LOG.error(PortMappingUtils.CANNOT_GET_DEV_CONF_LOGMSG, nodeId);
- return false;
+ return null;
}
- OrgOpenroadmDevice device = deviceObject.get();
+ OrgOpenroadmDevice device = deviceObject.orElseThrow();
if (device.getCircuitPacks() == null) {
- LOG.warn(PortMappingUtils.MISSING_CP_LOGMSG, nodeId, "found");
- return false;
+ LOG.warn(PortMappingUtils.MISSING_CP_LOGMSG, nodeId, PortMappingUtils.FOUND);
+ return null;
}
+ return device;
+ }
- Map<String, String> lcpMap = new HashMap<>();
- Map<String, Mapping> mappingMap = new HashMap<>();
+ private void getXpdrMaps(OrgOpenroadmDevice device, String nodeId,
+ Map<String, String> lcpMap, Map<String, Mapping> mappingMap) {
List<CircuitPacks> circuitPackList = new ArrayList<>(device.nonnullCircuitPacks().values());
circuitPackList.sort(Comparator.comparing(CircuitPack::getCircuitPackName));
if (device.getXponder() == null) {
for (CircuitPacks cp : circuitPackList) {
String circuitPackName = cp.getCircuitPackName();
if (cp.getPorts() == null) {
- LOG.warn(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, nodeId, "found", circuitPackName);
+ LOG.warn(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, nodeId, PortMappingUtils.FOUND, circuitPackName);
continue;
}
List<Ports> portList = new ArrayList<>(cp.nonnullPorts().values());
portList.sort(Comparator.comparing(Ports::getPortName));
for (Ports port : portList) {
int[] counters = fillXpdrLcpsMaps(line, client, nodeId,
- 1, null, circuitPackName, port,
+ 1, XpdrNodeTypes.Tpdr, circuitPackName, port,
circuitPackList, lcpMap, mappingMap);
line = counters[0];
client = counters[1];
}
}
} else {
- LOG.info(PortMappingUtils.XPDR_LIST_IN_CONF_LOGMSG, nodeId, "found");
- for (Xponder xponder : deviceObject.get().nonnullXponder().values()) {
+ LOG.info(PortMappingUtils.XPDR_LIST_IN_CONF_LOGMSG, nodeId, PortMappingUtils.FOUND);
+ for (Xponder xponder : device.nonnullXponder().values()) {
// Variables to keep track of number of line ports and client ports
int line = 1;
int client = 1;
XpdrNodeTypes xponderType = xponder.getXpdrType();
for (XpdrPort xpdrPort : xponder.nonnullXpdrPort().values().stream()
.sorted((xp1, xp2) -> xp1.getIndex().compareTo(xp2.getIndex())).collect(Collectors.toList())) {
- String circuitPackName = xpdrPort.getCircuitPackName();
- String portName = xpdrPort.getPortName();
- // If there xponder-subtree has missing circuit-packs or ports,
- // This gives a null-pointer expection,
- if (device.nonnullCircuitPacks().values().stream()
- .filter(cp -> cp.getCircuitPackName().equals(circuitPackName))
- .findFirst().isEmpty()) {
- LOG.warn(PortMappingUtils.MISSING_CP_LOGMSG + PortMappingUtils.PORTMAPPING_IGNORE_LOGMSG,
- nodeId, circuitPackName);
- continue;
- }
- if (device.nonnullCircuitPacks().values().stream()
- .filter(cp -> cp.getCircuitPackName().equals(circuitPackName))
- .findFirst().get().nonnullPorts().values().stream()
- .filter(p -> p.getPortName().equals(portName))
- .findFirst().isEmpty()) {
- LOG.warn(PortMappingUtils.NO_ASSOC_FOUND_LOGMSG + PortMappingUtils.PORTMAPPING_IGNORE_LOGMSG,
- nodeId, portName, circuitPackName, "in the device");
+ Ports port = getXpdrPorts(device, xpdrPort, nodeId);
+ if (port == null) {
continue;
}
- Ports port = device.nonnullCircuitPacks().values().stream()
- .filter(cp -> cp.getCircuitPackName().equals(circuitPackName))
- .findFirst().get().nonnullPorts().values().stream()
- .filter(p -> p.getPortName().equals(portName))
- .findFirst().get();
int[] counters = fillXpdrLcpsMaps(line, client, nodeId,
- xponderNb, xponderType, circuitPackName, port,
+ xponderNb, xponderType, xpdrPort.getCircuitPackName(), port,
circuitPackList, lcpMap, mappingMap);
line = counters[0];
client = counters[1];
}
}
}
+ }
- if (device.getConnectionMap() == null) {
- LOG.warn(PortMappingUtils.NO_CONMAP_LOGMSG, nodeId);
- } else {
- Collection<ConnectionMap> connectionMap = deviceObject.get().nonnullConnectionMap().values();
- for (ConnectionMap cm : connectionMap) {
- String skey = cm.getSource().getCircuitPackName() + "+" + cm.getSource().getPortName();
- String slcp = lcpMap.containsKey(skey) ? lcpMap.get(skey) : null;
- Destination destination0 = cm.nonnullDestination().values().iterator().next();
- String dkey = destination0.getCircuitPackName() + "+" + destination0.getPortName();
- if (slcp == null) {
- LOG.error(PortMappingUtils.CONMAP_ISSUE_LOGMSG, nodeId, skey, dkey);
- continue;
- }
- String dlcp = lcpMap.containsKey(dkey) ? lcpMap.get(dkey) : null;
- Mapping mapping = mappingMap.get(slcp);
- mappingMap.remove(slcp);
- portMapList.add(createXpdrMappingObject(nodeId, null, null, null, null, mapping, dlcp, null));
- }
+ private Ports getXpdrPorts(OrgOpenroadmDevice device, XpdrPort xpdrPort, String nodeId) {
+ String circuitPackName = xpdrPort.getCircuitPackName();
+ String portName = xpdrPort.getPortName();
+ // If there xponder-subtree has missing circuit-packs or ports,
+ // This gives a null-pointer expection,
+ Optional<CircuitPacks> cpList = device.nonnullCircuitPacks().values().stream()
+ .filter(cp -> cp.getCircuitPackName().equals(circuitPackName)).findFirst();
+ if (cpList.isEmpty()) {
+ LOG.warn(PortMappingUtils.MISSING_CP_LOGMSG + PortMappingUtils.PORTMAPPING_IGNORE_LOGMSG,
+ nodeId, circuitPackName);
+ return null;
}
+ Optional<Ports> portsList = cpList.orElseThrow().nonnullPorts().values().stream()
+ .filter(p -> p.getPortName().equals(portName)).findFirst();
+ if (portsList.isEmpty()) {
+ LOG.warn(PortMappingUtils.NO_ASSOC_FOUND_LOGMSG + PortMappingUtils.PORTMAPPING_IGNORE_LOGMSG,
+ nodeId, portName, circuitPackName, "in the device");
+ return null;
+ }
+ return portsList.orElseThrow();
+ }
- if (device.getOduSwitchingPools() != null) {
- Collection<OduSwitchingPools> oduSwithcingPools = device.nonnullOduSwitchingPools().values();
- List<SwitchingPoolLcp> switchingPoolList = new ArrayList<>();
- for (OduSwitchingPools odp : oduSwithcingPools) {
- Map<NonBlockingListKey,NonBlockingList> nbMap = new HashMap<>();
- for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org
- .openroadm.device.odu.switching.pools.NonBlockingList nbl : odp.nonnullNonBlockingList().values()) {
- if (nbl.getPortList() == null) {
+ private List<SwitchingPoolLcp> getSwitchingPoolList(OrgOpenroadmDevice device,
+ Map<String, String> lcpMap, String nodeId) {
+ List<SwitchingPoolLcp> switchingPoolList = new ArrayList<>();
+ for (OduSwitchingPools odp : device.nonnullOduSwitchingPools().values()) {
+ Map<NonBlockingListKey,NonBlockingList> nbMap = new HashMap<>();
+ for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org
+ .openroadm.device.odu.switching.pools.NonBlockingList nbl : odp.nonnullNonBlockingList().values()) {
+ if (nbl.getPortList() == null) {
+ continue;
+ }
+ Set<String> lcpList = new HashSet<>();
+ for (PortList item : nbl.nonnullPortList().values()) {
+ String key = item.getCircuitPackName() + "+" + item.getPortName();
+ if (!lcpMap.containsKey(key)) {
+ LOG.error(PortMappingUtils.NO_ASSOC_FOUND_LOGMSG,
+ nodeId, item.getPortName(), item.getCircuitPackName(), "to a logical connection point");
continue;
}
- List<String> lcpList = new ArrayList<>();
- for (PortList item : nbl.nonnullPortList().values()) {
- String key = item.getCircuitPackName() + "+" + item.getPortName();
- if (!lcpMap.containsKey(key)) {
- LOG.error(PortMappingUtils.NO_ASSOC_FOUND_LOGMSG,
- nodeId, item.getPortName(), item.getCircuitPackName(), "to a logical connection point");
- continue;
- }
- lcpList.add(lcpMap.get(key));
- }
- NonBlockingList nonBlockingList = new NonBlockingListBuilder()
- .setNblNumber(nbl.getNblNumber())
- .setInterconnectBandwidth(nbl.getInterconnectBandwidth())
- .setInterconnectBandwidthUnit(nbl.getInterconnectBandwidthUnit())
- .setLcpList(lcpList)
- .build();
- nbMap.put(nonBlockingList.key(), nonBlockingList);
+ lcpList.add(lcpMap.get(key));
}
- SwitchingPoolLcp splBldr = new SwitchingPoolLcpBuilder()
+ NonBlockingList nonBlockingList = new NonBlockingListBuilder()
+ .setNblNumber(nbl.getNblNumber())
+ .setInterconnectBandwidth(nbl.getInterconnectBandwidth())
+ .setInterconnectBandwidthUnit(nbl.getInterconnectBandwidthUnit())
+ .setLcpList(lcpList)
+ .build();
+ nbMap.put(nonBlockingList.key(), nonBlockingList);
+ }
+ switchingPoolList.add(
+ new SwitchingPoolLcpBuilder()
.setSwitchingPoolNumber(odp.getSwitchingPoolNumber())
.setSwitchingPoolType(odp.getSwitchingPoolType())
- //TODO differs from 2.2.1 SwitchingPoolTypes.forValue(odp.getSwitchingPoolType().getIntValue()
+ //TODO differs from 2.2.1 SwitchingPoolTypes.forValue(odp.getSwitchingPoolType().getIntValue())
.setNonBlockingList(nbMap)
- .build();
- switchingPoolList.add(splBldr);
- }
- postPortMapping(nodeId, null, null, null, switchingPoolList, null);
+ .build());
}
-
- if (!mappingMap.isEmpty()) {
- mappingMap.forEach((k,v) -> portMapList.add(v));
- }
- return true;
+ return switchingPoolList;
}
private boolean checkPartnerPortNotNull(Ports port) {
}
private boolean checkPartnerPort(String circuitPackName, Ports port1, Ports port2) {
- return (checkPartnerPortNoDir(circuitPackName, port1, port2)
- && ((Direction.Rx.getIntValue() == port1.getPortDirection().getIntValue()
- && Direction.Tx.getIntValue() == port2.getPortDirection().getIntValue())
- ||
- (Direction.Tx.getIntValue() == port1.getPortDirection().getIntValue()
- && Direction.Rx.getIntValue() == port2.getPortDirection().getIntValue())));
+ return checkPartnerPortNoDir(circuitPackName, port1, port2)
+ && Set.of(port1.getPortDirection().getIntValue(), port2.getPortDirection().getIntValue())
+ .equals(TXRX_SET);
}
List<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.srg.CircuitPacks> srgCps
= new ArrayList<>();
LOG.debug(PortMappingUtils.GETTING_CP_LOGMSG, deviceId, srgCounter);
- InstanceIdentifier<SharedRiskGroup> srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(srgCounter)));
+ InstanceIdentifier<SharedRiskGroup> srgIID = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(srgCounter)))
+ .build();
Optional<SharedRiskGroup> ordmSrgObject = this.deviceTransactionManager.getDataFromDevice(deviceId,
LogicalDatastoreType.OPERATIONAL, srgIID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
if (ordmSrgObject.isPresent()) {
- srgCps.addAll(ordmSrgObject.get().nonnullCircuitPacks().values());
- cpPerSrg.put(ordmSrgObject.get().getSrgNumber().toJava(), srgCps);
+ srgCps.addAll(ordmSrgObject.orElseThrow().nonnullCircuitPacks().values());
+ cpPerSrg.put(ordmSrgObject.orElseThrow().getSrgNumber().toJava(), srgCps);
}
}
LOG.info(PortMappingUtils.DEVICE_HAS_LOGMSG, deviceId, cpPerSrg.size(), "SRG");
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.rev200529.srg.CircuitPacks>> srgCps
- = getSrgCps(nodeId, deviceInfo);
for (Entry<Integer, List<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.srg.CircuitPacks>>
- srgCpEntry : srgCps.entrySet()) {
- List<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.srg.CircuitPacks> cpList =
- srgCps.get(srgCpEntry.getKey());
+ srgCpEntry : getSrgCps(nodeId, deviceInfo).entrySet()) {
List<String> keys = new ArrayList<>();
- for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.srg.CircuitPacks cp : cpList) {
+ int portIndex = 1;
+ for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.srg.CircuitPacks
+ cp : srgCpEntry.getValue()) {
String circuitPackName = cp.getCircuitPackName();
- InstanceIdentifier<CircuitPacks> cpIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(CircuitPacks.class, new CircuitPacksKey(circuitPackName));
- Optional<CircuitPacks> circuitPackObject = this.deviceTransactionManager.getDataFromDevice(nodeId,
- LogicalDatastoreType.OPERATIONAL, cpIID,
- Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
-
- if (circuitPackObject.isEmpty()) {
- LOG.warn(PortMappingUtils.MISSING_CP_LOGMSG + PortMappingUtils.PORTMAPPING_IGNORE_LOGMSG,
- nodeId, circuitPackName);
- continue;
- }
- if (circuitPackObject.get().getPorts() == null) {
- LOG.warn(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, nodeId, "found", circuitPackName);
- continue;
- }
-
- List<Ports> portList = new ArrayList<>(circuitPackObject.get().nonnullPorts().values());
+ List<Ports> portList = getPortList(circuitPackName, nodeId);
Collections.sort(portList, new SortPort710ByName());
- int portIndex = 1;
for (Ports port : portList) {
- String currentKey = circuitPackName + "-" + port.getPortName();
- if (port.getPortQual() == null) {
- continue;
- }
-
- if (PortQual.RoadmExternal.getIntValue() != port.getPortQual().getIntValue()) {
- LOG.debug(PortMappingUtils.PORT_NOT_RDMEXT_LOGMSG + PortMappingUtils.CANNOT_AS_LCP_LOGMSG,
- nodeId, port.getPortName(), circuitPackName);
+ if (!checkPortQual(port, circuitPackName, nodeId)) {
continue;
}
-
+ String currentKey = circuitPackName + "-" + port.getPortName();
if (keys.contains(currentKey)) {
LOG.debug(PortMappingUtils.PORT_ALREADY_HANDLED_LOGMSG + PortMappingUtils.CANNOT_AS_LCP_LOGMSG,
nodeId, port.getPortName(), circuitPackName);
continue;
}
-
switch (port.getPortDirection()) {
-
case Bidirectional:
String lcp = createLogicalConnectionPort(port, srgCpEntry.getKey(), portIndex);
LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG,
portIndex++;
keys.add(currentKey);
break;
-
case Rx:
case Tx:
- if (!checkPartnerPortNotNull(port)) {
- LOG.info(PortMappingUtils.NO_VALID_PARTNERPORT_LOGMSG
- + PortMappingUtils.CANNOT_AS_LCP_LOGMSG,
- nodeId, port.getPortName(), circuitPackName);
+ Ports port2 = getPartnerPort(port, circuitPackName, nodeId);
+ if (port2 == null) {
continue;
}
-
String lcp1 = createLogicalConnectionPort(port, srgCpEntry.getKey(), portIndex);
LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG,
nodeId, port.getPortName(), circuitPackName, lcp1);
- InstanceIdentifier<Ports> port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(CircuitPacks.class,
- new CircuitPacksKey(port.getPartnerPort().getCircuitPackName()))
- .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName()));
- Optional<Ports> port2Object = this.deviceTransactionManager
- .getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, port2ID,
- Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- if (port2Object.isEmpty()
- || port2Object.get().getPortQual().getIntValue()
- != PortQual.RoadmExternal.getIntValue()) {
- LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG
- + PortMappingUtils.PARTNERPORT_GET_ERROR_LOGMSG,
- nodeId, port.getPartnerPort().getPortName(),
- port.getPartnerPort().getCircuitPackName(),
- port.getPortName(), circuitPackName);
- continue;
- }
-
- Ports port2 = port2Object.get();
- if (!checkPartnerPort(circuitPackName, port, port2)) {
- LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG
- + PortMappingUtils.PARTNERPORT_CONF_ERROR_LOGMSG,
- nodeId, port2.getPortName(), port.getPartnerPort().getCircuitPackName(),
- port.getPortName(), circuitPackName);
- portIndex++;
- continue;
- }
String lcp2 = createLogicalConnectionPort(port2, srgCpEntry.getKey(),portIndex);
LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG,
nodeId, port2.getPortName(), circuitPackName, lcp2);
keys.add(currentKey);
keys.add(port.getPartnerPort().getCircuitPackName() + "-" + port2.getPortName());
break;
-
default:
LOG.error(PortMappingUtils.UNSUPPORTED_DIR_LOGMSG + PortMappingUtils.CANNOT_AS_LCP_LOGMSG,
nodeId, port.getPortName(), circuitPackName, port.getPortDirection());
-
}
}
}
return true;
}
+ private Ports getPartnerPort(Ports port, String circuitPackName, String nodeId) {
+ if (!checkPartnerPortNotNull(port)) {
+ LOG.info(PortMappingUtils.NO_VALID_PARTNERPORT_LOGMSG + PortMappingUtils.CANNOT_AS_LCP_LOGMSG,
+ nodeId, port.getPortName(), circuitPackName);
+ return null;
+ }
+ InstanceIdentifier<Ports> port2ID = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .child(CircuitPacks.class, new CircuitPacksKey(port.getPartnerPort().getCircuitPackName()))
+ .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName()))
+ .build();
+ Optional<Ports> port2Object = this.deviceTransactionManager
+ .getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, port2ID,
+ Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
+ if (port2Object.isEmpty()
+ || port2Object.orElseThrow().getPortQual().getIntValue() != PortQual.RoadmExternal.getIntValue()) {
+ LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG + PortMappingUtils.PARTNERPORT_GET_ERROR_LOGMSG,
+ nodeId, port.getPartnerPort().getPortName(), port.getPartnerPort().getCircuitPackName(),
+ port.getPortName(), circuitPackName);
+ return null;
+ }
+ Ports port2 = port2Object.orElseThrow();
+ if (!checkPartnerPort(circuitPackName, port, port2)) {
+ LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG + PortMappingUtils.PARTNERPORT_CONF_ERROR_LOGMSG,
+ nodeId, port2.getPortName(), port.getPartnerPort().getCircuitPackName(),
+ port.getPortName(), circuitPackName);
+ //TODO check if we really needed to increment portIndex in this condition
+ // if yes this block should not be in getPartnerPort and must move back to createPpPortMapping
+ return null;
+ }
+ return port2;
+ }
+
+ private List<Ports> getPortList(String circuitPackName, String nodeId) {
+ InstanceIdentifier<CircuitPacks> cpIID = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .child(CircuitPacks.class, new CircuitPacksKey(circuitPackName))
+ .build();
+ Optional<CircuitPacks> circuitPackObject = this.deviceTransactionManager.getDataFromDevice(nodeId,
+ LogicalDatastoreType.OPERATIONAL, cpIID,
+ Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
+ if (circuitPackObject.isEmpty()) {
+ LOG.warn(PortMappingUtils.MISSING_CP_LOGMSG + PortMappingUtils.PORTMAPPING_IGNORE_LOGMSG,
+ nodeId, circuitPackName);
+ return new ArrayList<>();
+ }
+ if (circuitPackObject.orElseThrow().getPorts() == null) {
+ LOG.warn(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, nodeId, PortMappingUtils.FOUND, circuitPackName);
+ return new ArrayList<>();
+ }
+ return new ArrayList<>(circuitPackObject.orElseThrow().nonnullPorts().values());
+ }
+
private String createLogicalConnectionPort(Ports port, int index, int portIndex) {
if (SUFFIX.containsKey(port.getPortDirection())) {
return String.join("-", "SRG" + index, "PP" + portIndex, SUFFIX.get(port.getPortDirection()));
private Map<McCapabilityProfileKey, McCapabilityProfile> getMcCapabilityProfiles(String deviceId, Info ordmInfo) {
Map<McCapabilityProfileKey, McCapabilityProfile> mcCapabilityProfiles = new HashMap<>();
- InstanceIdentifier<OrgOpenroadmDevice> deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class);
+ InstanceIdentifier<OrgOpenroadmDevice> deviceIID = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .build();
Optional<OrgOpenroadmDevice> deviceObject = deviceTransactionManager.getDataFromDevice(deviceId,
LogicalDatastoreType.OPERATIONAL, deviceIID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
OrgOpenroadmDevice device = null;
- if (!deviceObject.isPresent()) {
+ if (deviceObject.isEmpty()) {
LOG.error(PortMappingUtils.CANNOT_GET_DEV_CONF_LOGMSG, deviceId);
LOG.warn("MC-capabilities profile will be empty for node {}", deviceId);
return mcCapabilityProfiles;
}
- device = deviceObject.get();
+ device = deviceObject.orElseThrow();
mcCapabilityProfiles = device.getMcCapabilityProfile();
return mcCapabilityProfiles;
}
+ @SuppressFBWarnings(
+ value = "SLF4J_UNKNOWN_ARRAY",
+ justification = "False positive")
private Map<Integer, Degree> getDegreesMap(String deviceId, Info ordmInfo) {
Map<Integer, Degree> degrees = new HashMap<>();
for (int degreeCounter = 1; degreeCounter <= maxDegree; degreeCounter++) {
LOG.debug(PortMappingUtils.GETTING_CONPORT_LOGMSG, deviceId, degreeCounter);
- InstanceIdentifier<Degree> deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(Degree.class, new DegreeKey(Uint16.valueOf(degreeCounter)));
+ InstanceIdentifier<Degree> deviceIID = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .child(Degree.class, new DegreeKey(Uint16.valueOf(degreeCounter)))
+ .build();
Optional<Degree> ordmDegreeObject = this.deviceTransactionManager.getDataFromDevice(deviceId,
LogicalDatastoreType.OPERATIONAL, deviceIID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
if (ordmDegreeObject.isPresent()) {
- degrees.put(degreeCounter, ordmDegreeObject.get());
+ degrees.put(degreeCounter, ordmDegreeObject.orElseThrow());
}
}
LOG.info(PortMappingUtils.DEVICE_HAS_LOGMSG,
// if not present assume to be 20 (temporary)
Integer maxSrg = ordmInfo.getMaxSrgs() == null ? 20 : ordmInfo.getMaxSrgs().toJava();
for (int srgCounter = 1; srgCounter <= maxSrg; srgCounter++) {
- InstanceIdentifier<SharedRiskGroup> srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(srgCounter)));
+ InstanceIdentifier<SharedRiskGroup> srgIID = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(srgCounter)))
+ .build();
Optional<SharedRiskGroup> ordmSrgObject = this.deviceTransactionManager.getDataFromDevice(deviceId,
LogicalDatastoreType.OPERATIONAL, srgIID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
if (ordmSrgObject.isPresent()) {
- srgs.add(ordmSrgObject.get());
+ srgs.add(ordmSrgObject.orElseThrow());
}
}
private Map<String, String> getEthInterfaceList(String nodeId) {
LOG.info(PortMappingUtils.GETTING_ETH_LIST_LOGMSG, nodeId);
- InstanceIdentifier<Protocols> protocoliid = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(Protocols.class);
+ InstanceIdentifier<Protocols> protocoliid = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .child(Protocols.class)
+ .build();
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) {
+ if (protocolObject.isEmpty() || protocolObject.orElseThrow().augmentation(Protocols1.class).getLldp() == null) {
LOG.warn(PortMappingUtils.PROCESSING_DONE_LOGMSG, nodeId, PortMappingUtils.CANNOT_GET_LLDP_CONF_LOGMSG);
return new HashMap<>();
}
Map<String, String> cpToInterfaceMap = new HashMap<>();
- Lldp lldp = protocolObject.get().augmentation(Protocols1.class).getLldp();
+ Lldp lldp = protocolObject.orElseThrow().augmentation(Protocols1.class).getLldp();
for (PortConfig portConfig : lldp.nonnullPortConfig().values()) {
if (!portConfig.getAdminStatus().equals(PortConfig.AdminStatus.Txandrx)) {
continue;
}
- InstanceIdentifier<Interface> interfaceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(Interface.class, new InterfaceKey(portConfig.getIfName()));
+ InstanceIdentifier<Interface> interfaceIID = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .child(Interface.class, new InterfaceKey(portConfig.getIfName()))
+ .build();
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)) {
+ if (interfaceObject.isEmpty() || interfaceObject.orElseThrow().getSupportingCircuitPackName() == null) {
continue;
}
- String supportingCircuitPackName = interfaceObject.get().getSupportingCircuitPackName();
+ String supportingCircuitPackName = interfaceObject.orElseThrow().getSupportingCircuitPackName();
cpToInterfaceMap.put(supportingCircuitPackName, portConfig.getIfName());
- InstanceIdentifier<CircuitPacks> circuitPacksIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(CircuitPacks.class, new CircuitPacksKey(supportingCircuitPackName));
+ InstanceIdentifier<CircuitPacks> circuitPacksIID = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .child(CircuitPacks.class, new CircuitPacksKey(supportingCircuitPackName))
+ .build();
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)) {
+ if (circuitPackObject.isEmpty() || circuitPackObject.orElseThrow().getParentCircuitPack() == null) {
continue;
}
- cpToInterfaceMap.put(circuitPackObject.get().getParentCircuitPack().getCircuitPackName(),
+ cpToInterfaceMap.put(circuitPackObject.orElseThrow().getParentCircuitPack().getCircuitPackName(),
portConfig.getIfName());
}
LOG.info(PortMappingUtils.PROCESSING_DONE_LOGMSG, nodeId, " - success");
private Mapping updateMappingObject(String nodeId, Ports port, Mapping oldmapping) {
MappingBuilder mpBldr = new MappingBuilder(oldmapping);
updateMappingStates(mpBldr, port, oldmapping);
- if ((port.getInterfaces() == null)
- || (!oldmapping.getLogicalConnectionPoint().contains(StringConstants.TTP_TOKEN)
- && !oldmapping.getLogicalConnectionPoint().contains(StringConstants.NETWORK_TOKEN))) {
+ if (port.getInterfaces() == null) {
return mpBldr.build();
}
// Get interfaces provisioned on the port
}
private MappingBuilder updateMappingInterfaces(String nodeId, MappingBuilder mpBldr, Ports port) {
+ mpBldr.setSupportingOtu4(null)
+ .setSupportingOdu4(null)
+ .setSupportingOducn(null)
+ .setSupportingOtucn(null);
for (Interfaces interfaces : port.getInterfaces()) {
- try {
- Optional<Interface> openRoadmInterface = this.openRoadmInterfaces.getInterface(nodeId,
- interfaces.getInterfaceName());
- if (openRoadmInterface.isEmpty()) {
- LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG,
- nodeId, interfaces.getInterfaceName() + "- empty interface");
- continue;
- }
- LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG,
- nodeId, openRoadmInterface.get().getName(), openRoadmInterface.get().getType());
- Class<? extends InterfaceType> interfaceType
- = (Class<? extends InterfaceType>) openRoadmInterface.get().getType();
- // Check if interface type is OMS or OTS
- if (interfaceType.equals(OpenROADMOpticalMultiplex.class)) {
- mpBldr.setSupportingOms(interfaces.getInterfaceName());
- }
- if (interfaceType.equals(OpticalTransport.class)) {
- mpBldr.setSupportingOts(interfaces.getInterfaceName());
+ Optional<Interface> openRoadmInterface = getInterfaceFromDevice(nodeId,
+ interfaces.getInterfaceName());
+ if (openRoadmInterface.isEmpty()) {
+ LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG,
+ nodeId, interfaces.getInterfaceName() + "- empty interface");
+ continue;
+ }
+ InterfaceType interfaceType = openRoadmInterface.orElseThrow().getType();
+ LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG, nodeId, openRoadmInterface.orElseThrow().getName(),
+ interfaceType);
+ // Check if interface type is OMS or OTS
+ // Switch/Case might be more indicated here but is not possible in jdk17 w/o enable-preview
+ if (interfaceType.equals(OpenROADMOpticalMultiplex.VALUE)) {
+ mpBldr.setSupportingOms(interfaces.getInterfaceName());
+ } else if (interfaceType.equals(OpticalTransport.VALUE)) {
+ mpBldr.setSupportingOts(interfaces.getInterfaceName());
+ //TODO check if the following lines for Eth CSMACD present in 1.2.1 and 2.2.1 were not forgotten in 7.1
+ //} else if(interfaceType.equals(EthernetCsmacd.VALUE)) {
+ // mpBldr.setSupportingEthernet(interfaces.getInterfaceName());
+ } else if (interfaceType.equals(OtnOtu.VALUE)) {
+ String interfaceName = interfaces.getInterfaceName();
+ String suffix = interfaceName.substring(interfaceName.lastIndexOf("-") + 1);
+ if (suffix.equals("OTU4")) {
+ mpBldr.setSupportingOtu4(interfaces.getInterfaceName());
+ } else if (suffix.contains("OTUC")) {
+ mpBldr.setSupportingOtucn(interfaces.getInterfaceName());
}
+ } else if (interfaceType.equals(OtnOdu.VALUE)) {
String interfaceName = interfaces.getInterfaceName();
- if (interfaceType.equals(OtnOdu.class)
- && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1)
- .equals("ODU"))) {
+ String suffix = interfaceName.substring(interfaceName.lastIndexOf("-") + 1);
+ if (suffix.equals("ODU4")) {
mpBldr.setSupportingOdu4(interfaces.getInterfaceName());
+ } else if (suffix.contains("ODUC")) {
+ mpBldr.setSupportingOducn(interfaces.getInterfaceName());
}
- if ((interfaceType.equals(OtnOdu.class))
- && (interfaceName.substring(interfaceName.lastIndexOf("-") + 1)
- .equals("ODUC4"))) {
- mpBldr.setSupportingOduc4(interfaces.getInterfaceName());
- }
-
- } catch (OpenRoadmInterfaceException ex) {
- LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG,
- nodeId, interfaces.getInterfaceName(), ex);
}
}
return mpBldr;
// update existing mapping
return new MappingBuilder(mapping).setConnectionMapLcp(connectionMapLcp).build();
}
+ return createNewXpdrMapping(nodeId, port, circuitPackName, logicalConnectionPoint, partnerLcp, xpdrNodeType);
+ }
- // create a new mapping
- String nodeIdLcp = nodeId + "-" + logicalConnectionPoint;
+ private Mapping createNewXpdrMapping(String nodeId, Ports port, String circuitPackName,
+ String logicalConnectionPoint, String partnerLcp, XpdrNodeTypes xpdrNodeType) {
MappingBuilder mpBldr = new MappingBuilder()
.withKey(new MappingKey(logicalConnectionPoint))
.setLogicalConnectionPoint(logicalConnectionPoint)
.setSupportingCircuitPackName(circuitPackName)
.setSupportingPort(port.getPortName())
.setPortDirection(port.getPortDirection().getName())
- .setLcpHashVal(PortMappingUtils.fnv1size64(nodeIdLcp));
+ .setLcpHashVal(PortMappingUtils.fnv1size64(nodeId + "-" + logicalConnectionPoint));
if (port.getPortQual() != null) {
mpBldr.setPortQual(port.getPortQual().getName());
}
if (xpdrNodeType != null) {
- mpBldr.setXponderType(xpdrNodeType);
+ mpBldr.setXpdrType(xpdrNodeType);
}
if (partnerLcp != null) {
mpBldr.setPartnerLcp(partnerLcp);
}
- if (port.augmentation(Ports1.class) != null && port.augmentation(Ports1.class).getPortCapabilities() != null) {
- List<Class<? extends org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327
- .SupportedIfCapability>> supportedIntf = new ArrayList<>();
- Map<SupportedInterfaceCapabilityKey, SupportedInterfaceCapability> supIfCapMap = port
- .augmentation(Ports1.class).getPortCapabilities().nonnullSupportedInterfaceCapability();
- SupportedInterfaceCapability sic1 = null;
- for (SupportedInterfaceCapability sic : supIfCapMap.values()) {
- supportedIntf.add(sic.getIfCapType());
- sic1 = sic;
- }
- if (port.getPortQual() == PortQual.SwitchClient
- && !sic1.getOtnCapability().getMpdrClientRestriction().isEmpty()) {
- List<MpdrClientRestriction> mpdrClientRestriction = sic1.getOtnCapability().getMpdrClientRestriction();
- // Here we assume all the supported-interfaces has the support same rates, and the
- // trib-slot numbers are assumed to be the same
- String mxpProfileName = mpdrClientRestriction.get(0).getMuxpProfileName().get(0);
- // From this muxponder-profile get the min-trib-slot and the max-trib-slot
- LOG.info("{}: Muxp-profile used for trib information {}", nodeId, mxpProfileName);
- // This provides the tribSlot information from muxProfile
- List<OpucnTribSlotDef> minMaxOpucnTribSlots = getOpucnTribSlots(nodeId, mxpProfileName);
- mpBldr.setMpdrRestrictions(
- new MpdrRestrictionsBuilder()
- .setMinTribSlot(minMaxOpucnTribSlots.get(0))
- .setMaxTribSlot(minMaxOpucnTribSlots.get(1))
- .build());
+ Collection<SupportedInterfaceCapability> supIntfCapaList = getSupIntfCapaList(port);
+ if (supIntfCapaList != null) {
+ Set<org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev230526.SupportedIfCapability>
+ supportedIntf = new HashSet<>();
+ Set<String> regenProfiles = new HashSet<>();
+ for (SupportedInterfaceCapability sic : supIntfCapaList) {
+ // Here it could add null values and cause a null pointer exception
+ // Especially when the MappingUtilsImpl does not contain required supported-if-cap
+ if (MappingUtilsImpl.convertSupIfCapa(sic.getIfCapType().toString()) != null) {
+ supportedIntf.add(MappingUtilsImpl.convertSupIfCapa(sic.getIfCapType().toString()));
+ }
+ LOG.debug("This the xpdr-type {}", xpdrNodeType.getName());
+ // Here we use both types of Regen (bi/uni). Though initial support is only for bi-directional regen
+ if (xpdrNodeType == XpdrNodeTypes.Regen || xpdrNodeType == XpdrNodeTypes.RegenUni) {
+ if (sic.getOtsigroupCapabilityProfileName().isEmpty()) {
+ LOG.error("Otsigroup-capability-profile-name is not found for regen port {}",
+ port.getPortName());
+ }
+ LOG.info("Regen-profiles {}", sic.getOtsigroupCapabilityProfileName());
+ regenProfiles.addAll(sic.getOtsigroupCapabilityProfileName());
+ }
+ if (port.getPortQual() == PortQual.SwitchClient
+ && sic.getOtnCapability() != null) {
+ // Here we assume all the supported-interfaces has the support same rates, and the
+ // trib-slot numbers are assumed to be the same
+ String mxpProfileName = sic.getOtnCapability().getMpdrClientRestriction().get(0)
+ .getMuxpProfileName().stream().findFirst().orElseThrow();
+ // From this muxponder-profile get the min-trib-slot and the max-trib-slot
+ LOG.info("{}: Muxp-profile used for trib information {}", nodeId, mxpProfileName);
+ // This provides the tribSlot information from muxProfile
+ List<OpucnTribSlotDef> minMaxOpucnTribSlots = getOpucnTribSlots(nodeId, mxpProfileName);
+ mpBldr.setMpdrRestrictions(
+ new MpdrRestrictionsBuilder()
+ .setMinTribSlot(minMaxOpucnTribSlots.get(0))
+ .setMaxTribSlot(minMaxOpucnTribSlots.get(1))
+ .build());
+ }
}
- mpBldr.setSupportedInterfaceCapability(supportedIntf);
+ mpBldr.setRegenProfiles(new RegenProfilesBuilder().setRegenProfile(regenProfiles).build())
+ .setSupportedInterfaceCapability(supportedIntf);
}
if (port.getAdministrativeState() != null) {
mpBldr.setPortAdminState(port.getAdministrativeState().name());
return mpBldr.build();
}
+ private Collection<SupportedInterfaceCapability> getSupIntfCapaList(Ports port) {
+ return
+ port.augmentation(Ports1.class) == null || port.augmentation(Ports1.class).getPortCapabilities() == null
+ ? null
+ : port.augmentation(Ports1.class).getPortCapabilities().nonnullSupportedInterfaceCapability().values();
+ }
+
private ArrayList<OpucnTribSlotDef> getOpucnTribSlots(String deviceId, String mxpProfileName) {
ArrayList<OpucnTribSlotDef> minMaxOpucnTribSlots = new ArrayList<>(2);
LOG.info("{} : Getting Min/Max Trib-slots from {}", deviceId, mxpProfileName);
- InstanceIdentifier<MuxpProfile> deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(MuxpProfile.class, new MuxpProfileKey(mxpProfileName));
+ InstanceIdentifier<MuxpProfile> deviceIID = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .child(MuxpProfile.class, new MuxpProfileKey(mxpProfileName))
+ .build();
Optional<MuxpProfile> muxpProfileObject = this.deviceTransactionManager.getDataFromDevice(deviceId,
LogicalDatastoreType.OPERATIONAL, deviceIID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- List<OpucnTribSlotDef> ntwHoOduOpucnTribSlots = muxpProfileObject.get().getNetworkHoOduOpucnTribSlots();
+ Set<OpucnTribSlotDef> ntwHoOduOpucnTribSlots = muxpProfileObject.orElseThrow().getNetworkHoOduOpucnTribSlots();
// Sort the tib-slots in ascending order and pick min and max
List<OpucnTribSlotDef> sortedNtwHoOduOpucnTribSlots = ntwHoOduOpucnTribSlots.stream().sorted(
Comparator.comparingDouble(x -> Double.parseDouble(
LOG.error(PortMappingUtils.MISSING_CP_LOGMSG, nodeId, port.getPartnerPort().getCircuitPackName());
return null;
}
- Optional<Ports> poOpt = cpOpt.get().nonnullPorts().values().stream()
+ Optional<Ports> poOpt = cpOpt.orElseThrow().nonnullPorts().values().stream()
.filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName()))
.findFirst();
if (poOpt.isEmpty()) {
nodeId, port.getPartnerPort().getPortName(), port.getPartnerPort().getCircuitPackName());
return null;
}
- Ports port2 = poOpt.get();
- circuitPackName2.append(cpOpt.get().getCircuitPackName());
+ Ports port2 = poOpt.orElseThrow();
+ circuitPackName2.append(cpOpt.orElseThrow().getCircuitPackName());
if (!checkPartnerPort(circuitPackName, port, port2)) {
LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG,
nodeId, port2.getPortName(), circuitPackName2, port.getPortName(), circuitPackName);
PortMappingUtils.createXpdrLogicalConnectionPort(xponderNb, client, StringConstants.CLIENT_TOKEN);
lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp0);
mappingMap.put(lcp0,
- createXpdrMappingObject(nodeId, port, circuitPackName, lcp0, null, null, null, null));
+ createXpdrMappingObject(nodeId, port, circuitPackName, lcp0, null, null, null, xponderType));
client++;
break;
LOG.info(PortMappingUtils.MAP_LOOKS_LOGMSG, nodeId, interfaceList);
postPortMapping(nodeId, null, null, cpToDegreeList, null, null);
- Map<Integer, List<ConnectionPorts>> connectionPortMap = getPerDegreePorts(nodeId, deviceInfo);
- for (Entry<Integer, List<ConnectionPorts>> cpMapEntry : connectionPortMap.entrySet()) {
- switch (connectionPortMap.get(cpMapEntry.getKey()).size()) {
+ for (Entry<Integer, List<ConnectionPorts>> cpMapEntry : getPerDegreePorts(nodeId, deviceInfo).entrySet()) {
+ List<ConnectionPorts> cpMapValue = cpMapEntry.getValue();
+ ConnectionPorts cp1 = cpMapValue.get(0);
+ String cp1Name = cp1.getCircuitPackName();
+ switch (cpMapValue.size()) {
case 1:
// port is bidirectional
- String cpName = connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName();
- InstanceIdentifier<Ports> portID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(CircuitPacks.class, new CircuitPacksKey(cpName))
- .child(Ports.class,
- new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName()));
- LOG.debug(PortMappingUtils.FETCH_CONNECTIONPORT_LOGMSG,
- nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), cpName);
- Optional<Ports> portObject = this.deviceTransactionManager.getDataFromDevice(nodeId,
- LogicalDatastoreType.OPERATIONAL, portID, Timeouts.DEVICE_READ_TIMEOUT,
- Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- if (!portObject.isPresent()) {
- LOG.error(PortMappingUtils.NO_PORT_ON_CP_LOGMSG,
- nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), cpName);
+ Ports port = getTtpPort(cp1, cp1Name, nodeId);
+ if (port == null) {
return false;
}
- Ports port = portObject.get();
- if (port.getPortQual() == null) {
+ if (!checkTtpPort(port, cp1Name, nodeId, true)) {
continue;
}
- if (PortQual.RoadmExternal.getIntValue() != port.getPortQual().getIntValue()) {
- LOG.error(PortMappingUtils.CANNOT_CREATE_LCP_LOGMSG + PortMappingUtils.PORTQUAL_ERROR_LOGMSG,
- nodeId, port.getPortName(), cpName);
- continue;
- }
- if (Direction.Bidirectional.getIntValue() != port.getPortDirection().getIntValue()) {
- LOG.error(PortMappingUtils.CANNOT_CREATE_LCP_LOGMSG + PortMappingUtils.PORTDIR_ERROR_LOGMSG,
- nodeId, port.getPortName(), cpName);
- continue;
- }
-
String logicalConnectionPoint =
PortMappingUtils.degreeTtpNodeName(cpMapEntry.getKey().toString(), "TXRX");
LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG,
- nodeId, port.getPortName(), cpName, logicalConnectionPoint);
- portMapList.add(createMappingObject(nodeId, port, cpName, logicalConnectionPoint));
+ nodeId, port.getPortName(), cp1Name, logicalConnectionPoint);
+ portMapList.add(createMappingObject(nodeId, port, cp1Name, logicalConnectionPoint));
break;
case 2:
// ports are unidirectionals
- String cp1Name = connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName();
- String cp2Name = connectionPortMap.get(cpMapEntry.getKey()).get(1).getCircuitPackName();
- InstanceIdentifier<Ports> port1ID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(CircuitPacks.class, new CircuitPacksKey(cp1Name))
- .child(Ports.class,
- new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName()));
- LOG.debug(PortMappingUtils.FETCH_CONNECTIONPORT_LOGMSG,
- nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), cp1Name);
- Optional<Ports> port1Object = this.deviceTransactionManager.getDataFromDevice(nodeId,
- LogicalDatastoreType.OPERATIONAL, port1ID, Timeouts.DEVICE_READ_TIMEOUT,
- Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- InstanceIdentifier<Ports> port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(CircuitPacks.class, new CircuitPacksKey(cp2Name))
- .child(Ports.class,
- new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName()));
- LOG.debug(PortMappingUtils.FETCH_CONNECTIONPORT_LOGMSG,
- nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName(), cp2Name);
- Optional<Ports> port2Object = this.deviceTransactionManager.getDataFromDevice(nodeId,
- LogicalDatastoreType.OPERATIONAL, port2ID, Timeouts.DEVICE_READ_TIMEOUT,
- Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- if (!port1Object.isPresent() || !port2Object.isPresent()) {
- LOG.error(PortMappingUtils.NO_PORT_ON_CP_LOGMSG,
- nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), cp1Name);
+ Ports port1 = getTtpPort(cp1, cp1Name, nodeId);
+ if (port1 == null) {
return false;
}
- if (!port2Object.isPresent()) {
- LOG.error(PortMappingUtils.NO_PORT_ON_CP_LOGMSG,
- nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName(), cp2Name);
+ ConnectionPorts cp2 = cpMapValue.get(1);
+ String cp2Name = cp2.getCircuitPackName();
+ Ports port2 = getTtpPort(cp2, cp2Name, nodeId);
+ if (port2 == null) {
return false;
}
-
- Ports port1 = port1Object.get();
- Ports port2 = port2Object.get();
- if (port1.getPortQual() == null || port2.getPortQual() == null) {
- continue;
- }
- if (PortQual.RoadmExternal.getIntValue() != port1.getPortQual().getIntValue()) {
- LOG.error(PortMappingUtils.CANNOT_CREATE_LCP_LOGMSG + PortMappingUtils.PORTQUAL_ERROR_LOGMSG,
- nodeId, port1.getPortName(), cp1Name);
- continue;
- }
- if (PortQual.RoadmExternal.getIntValue() != port2.getPortQual().getIntValue()) {
- LOG.error(PortMappingUtils.CANNOT_CREATE_LCP_LOGMSG + PortMappingUtils.PORTQUAL_ERROR_LOGMSG,
- nodeId, port2.getPortName(), cp2Name);
- continue;
- }
-
- if (!checkPartnerPort(cp1Name, port1, port2)) {
- LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG,
- 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(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG,
- nodeId, port1.getPortName(), cp1Name, port2.getPortName(), cp2Name);
+ if (!checkTtpPortsUnidir(port1, port2, cp1Name, cp2Name, nodeId)) {
continue;
}
-
String logicalConnectionPoint1 = PortMappingUtils.degreeTtpNodeName(cpMapEntry.getKey().toString(),
port1.getPortDirection().getName().toUpperCase(Locale.getDefault()));
LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG,
default:
LOG.error(PortMappingUtils.NOT_CORRECT_CONPORT_LOGMSG, nodeId, cpMapEntry.getKey());
continue;
+ //TODO should it be continue or return false ?
}
}
return true;
}
- private NodeInfo createNodeInfo(Info deviceInfo) {
+ private Ports getTtpPort(ConnectionPorts cp, String cpName, String nodeId) {
+ InstanceIdentifier<Ports> portID = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .child(CircuitPacks.class, new CircuitPacksKey(cpName))
+ .child(Ports.class, new PortsKey(cp.getPortName()))
+ .build();
+ LOG.debug(PortMappingUtils.FETCH_CONNECTIONPORT_LOGMSG, nodeId, cp.getPortName(), cpName);
+ Optional<Ports> portObject = this.deviceTransactionManager.getDataFromDevice(nodeId,
+ LogicalDatastoreType.OPERATIONAL, portID, Timeouts.DEVICE_READ_TIMEOUT,
+ Timeouts.DEVICE_READ_TIMEOUT_UNIT);
+ if (portObject.isEmpty()) {
+ LOG.error(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, nodeId, cp.getPortName(), cpName);
+ return null;
+ }
+ return portObject.orElseThrow();
+ }
+
+ private boolean checkPortQual(Ports port, String cpName, String nodeId) {
+ if (port.getPortQual() == null) {
+ return false;
+ }
+ if (PortQual.RoadmExternal.getIntValue() != port.getPortQual().getIntValue()) {
+ //used to be LOG.error when called from createTtpPortMapping
+ LOG.debug(PortMappingUtils.PORT_NOT_RDMEXT_LOGMSG + PortMappingUtils.CANNOT_AS_LCP_LOGMSG,
+ nodeId, port.getPortName(), cpName);
+ return false;
+ }
+ return true;
+ }
+
+ private boolean checkTtpPort(Ports port, String cpName, String nodeId, boolean bidirectional) {
+ if (!checkPortQual(port, cpName, nodeId)) {
+ return false;
+ }
+ if (Direction.Bidirectional.getIntValue() == port.getPortDirection().getIntValue() ^ bidirectional) {
+ // (a ^ b) makes more sense than (!a && b) here since it can also work for unidirectional links
+ LOG.error(PortMappingUtils.PORTDIR_ERROR_LOGMSG + PortMappingUtils.CANNOT_AS_LCP_LOGMSG,
+ nodeId, port.getPortName(), cpName);
+ return false;
+ }
+ return true;
+ }
+ private boolean checkTtpPortsUnidir(Ports port1, Ports port2, String cp1Name, String cp2Name, String nodeId) {
+ if (!checkTtpPort(port1, cp1Name, nodeId, false)) {
+ return false;
+ }
+ if (!checkTtpPort(port2, cp2Name, nodeId, false)) {
+ return false;
+ }
+ if (!checkPartnerPort(cp1Name, port1, port2)) {
+ LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG,
+ nodeId, port2.getPortName(), cp2Name, port1.getPortName(), cp1Name);
+ return false;
+ }
+ // Directions checks are the same for cp1 and cp2, no need to check them twice.
+ if (!checkPartnerPortNoDir(cp2Name, port2, port1)) {
+ LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG,
+ nodeId, port1.getPortName(), cp1Name, port2.getPortName(), cp2Name);
+ return false;
+ }
+ return true;
+ }
+
+ private NodeInfo createNodeInfo(Info deviceInfo) {
if (deviceInfo.getNodeType() == null) {
// TODO make mandatory in yang
LOG.error(PortMappingUtils.NODE_TYPE_LOGMSG, deviceInfo.getNodeId(), "field missing");
return null;
}
-
NodeInfoBuilder nodeInfoBldr = new NodeInfoBuilder()
.setOpenroadmVersion(OpenroadmNodeVersion._71)
+ .setNodeClli(
+ deviceInfo.getClli() == null || deviceInfo.getClli().isEmpty()
+ ? "defaultCLLI"
+ : deviceInfo.getClli())
.setNodeType(deviceInfo.getNodeType());
// TODO: 221 versions expects an int value - need to check whether it is bug or an evolution here
- if (deviceInfo.getClli() != null && !deviceInfo.getClli().isEmpty()) {
- nodeInfoBldr.setNodeClli(deviceInfo.getClli());
- } else {
- nodeInfoBldr.setNodeClli("defaultCLLI");
- }
if (deviceInfo.getModel() != null) {
nodeInfoBldr.setNodeModel(deviceInfo.getModel());
}
if (deviceInfo.getIpAddress() != null) {
nodeInfoBldr.setNodeIpAddress(deviceInfo.getIpAddress());
}
-
return nodeInfoBldr.build();
}
return null;
}
+ private Optional<Interface> getInterfaceFromDevice(String nodeId, String interfaceName) {
+ InstanceIdentifier<Interface> interfacesIID = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .child(Interface.class, new InterfaceKey(interfaceName))
+ .build();
+ return deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.CONFIGURATION,
+ interfacesIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
+ }
}
Code Review / transportpce.git / blobdiff