import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.NetworkBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.NodesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.CpToDegree;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.CpToDegreeBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.CpToDegreeKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.MappingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.MappingKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.McCapabilities;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.McCapabilitiesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.McCapabilitiesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.NodeInfo;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.NodeInfo.OpenroadmVersion;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.NodeInfoBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.SwitchingPoolLcp;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.SwitchingPoolLcpBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.SwitchingPoolLcpKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.switching.pool.lcp.NonBlockingList;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.switching.pool.lcp.NonBlockingListBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.switching.pool.lcp.NonBlockingListKey;
+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.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.openroadm.common.optical.channel.types.rev200529.FrequencyGHz;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.Direction;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.PortQual;
// FIXME: many common pieces of code between PortMapping Versions 121 and 221 and 710
// some mutualization would be helpful
public class PortMappingVersion221 {
+
private static final Logger LOG = LoggerFactory.getLogger(PortMappingVersion221.class);
private static final Map<Direction, String> SUFFIX;
}
public PortMappingVersion221(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager,
- OpenRoadmInterfaces openRoadmInterfaces) {
+ OpenRoadmInterfaces openRoadmInterfaces) {
this.dataBroker = dataBroker;
this.deviceTransactionManager = deviceTransactionManager;
this.openRoadmInterfaces = openRoadmInterfaces;
}
public boolean createMappingData(String nodeId) {
- LOG.info("{} : OpenROADM version 2.2.1 node - Creating Mapping Data", nodeId);
+ LOG.info(PortMappingUtils.CREATE_MAPPING_DATA_LOGMSG, nodeId, "2.2.1");
List<Mapping> portMapList = new ArrayList<>();
Map<McCapabilitiesKey, McCapabilities> mcCapabilities = new HashMap<>();
InstanceIdentifier<Info> infoIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child(Info.class);
Optional<Info> deviceInfoOptional = this.deviceTransactionManager.getDataFromDevice(
nodeId, LogicalDatastoreType.OPERATIONAL, infoIID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- if (!deviceInfoOptional.isPresent()) {
- LOG.warn("{} : Device info subtree is absent", nodeId);
+ if (deviceInfoOptional.isEmpty()) {
+ LOG.warn(PortMappingUtils.DEVICE_HAS_LOGMSG, nodeId, "no info", "subtree");
return false;
}
Info deviceInfo = deviceInfoOptional.get();
// Get TTP port mapping
if (!createTtpPortMapping(nodeId, deviceInfo, portMapList)) {
// return false if mapping creation for TTP's failed
- LOG.warn("{} : Unable to create mapping for TTP's", nodeId);
+ LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, "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("{} : Unable to create mapping for PP's", nodeId);
+ LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, "create", "PP's");
return false;
}
// Get MC capabilities
if (!createMcCapabilitiesList(nodeId, deviceInfo, mcCapabilities)) {
// return false if MC capabilites failed
- LOG.warn("{} : Unable to create MC capabilities", nodeId);
+ LOG.warn(PortMappingUtils.UNABLE_MC_CAPA_LOGMSG, nodeId);
return false;
}
break;
case Xpdr:
if (!createXpdrPortMapping(nodeId, portMapList)) {
- LOG.warn("{} : Unable to create mapping for the Xponder", nodeId);
+ LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, "create", "Xponder");
return false;
}
break;
default:
- LOG.error("{} : unknown nodetype - Unable to create mapping", nodeId);
+ LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG,
+ nodeId, "create", deviceInfo.getNodeType() + " - unknown nodetype");
break;
}
}
public boolean updateMapping(String nodeId, Mapping oldMapping) {
- InstanceIdentifier<Ports> portIId = InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(CircuitPacks.class, new CircuitPacksKey(oldMapping.getSupportingCircuitPackName()))
- .child(Ports.class, new PortsKey(oldMapping.getSupportingPort()));
- if ((oldMapping == null) || (nodeId == null)) {
- LOG.error("Impossible to update mapping");
+ if (nodeId == null) {
+ LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG, "node id null" , "update", "a null value");
+ return false;
+ }
+ if (oldMapping == null) {
+ LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, "update", "a null value");
return false;
}
+ InstanceIdentifier<Ports> portId = InstanceIdentifier.create(OrgOpenroadmDevice.class)
+ .child(CircuitPacks.class, new CircuitPacksKey(oldMapping.getSupportingCircuitPackName()))
+ .child(Ports.class, new PortsKey(oldMapping.getSupportingPort()));
try {
- Optional<Ports> portObject = deviceTransactionManager.getDataFromDevice(nodeId,
- LogicalDatastoreType.OPERATIONAL, portIId, Timeouts.DEVICE_READ_TIMEOUT,
- Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- if (!portObject.isPresent()) {
- return false;
- }
- Ports port = portObject.get();
- Mapping newMapping = createMappingObject(nodeId, port, oldMapping.getSupportingCircuitPackName(),
- oldMapping.getLogicalConnectionPoint());
- LOG.debug("{} : Updating old mapping Data {} for {} by new mapping data {}",
- nodeId, oldMapping, oldMapping.getLogicalConnectionPoint(), newMapping);
+ Ports port = deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL,
+ portId, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT).get();
+ Mapping newMapping = updateMappingObject(nodeId, port, oldMapping);
+ LOG.debug(PortMappingUtils.UPDATE_MAPPING_LOGMSG,
+ nodeId, oldMapping, oldMapping.getLogicalConnectionPoint(), newMapping);
final WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction();
InstanceIdentifier<Mapping> mapIID = InstanceIdentifier.create(Network.class)
.child(Nodes.class, new NodesKey(nodeId))
commit.get();
return true;
} catch (InterruptedException | ExecutionException e) {
- LOG.error("{} : exception when updating Mapping {} - ",
- nodeId, oldMapping.getLogicalConnectionPoint(), e);
+ LOG.error(PortMappingUtils.UNABLE_MAPPING_LOGMSG,
+ nodeId, "update", oldMapping.getLogicalConnectionPoint(), e);
return false;
}
}
LogicalDatastoreType.OPERATIONAL, deviceIID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
if (!deviceObject.isPresent()) {
- LOG.error("{} : Impossible to get device configuration", nodeId);
+ LOG.error(PortMappingUtils.CANNOT_GET_DEV_CONF_LOGMSG, nodeId);
return false;
}
OrgOpenroadmDevice device = deviceObject.get();
if (device.getCircuitPacks() == null) {
- LOG.warn("{} : Circuit Packs not present", nodeId);
+ LOG.warn(PortMappingUtils.MISSING_CP_LOGMSG, nodeId, "found");
return false;
}
List<CircuitPacks> 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(PortMappingUtils.XPDR_LIST_IN_CONF_LOGMSG, nodeId, "not found");
// Variables to keep track of number of line ports and client ports
int line = 1;
int client = 1;
for (CircuitPacks cp : circuitPackList) {
String circuitPackName = cp.getCircuitPackName();
if (cp.getPorts() == null) {
- LOG.warn("{} : Ports were not found for circuit pack {}", nodeId, circuitPackName);
+ LOG.warn(PortMappingUtils.NO_PORT_ON_CP_LOGMSG, nodeId, "found", circuitPackName);
continue;
}
List<Ports> portList = new ArrayList<>(cp.nonnullPorts().values());
}
}
} else {
- LOG.info("{} : configuration contains a list of xponders", nodeId);
+ LOG.info(PortMappingUtils.XPDR_LIST_IN_CONF_LOGMSG, nodeId, "found");
for (Xponder xponder : deviceObject.get().nonnullXponder().values()) {
// Variables to keep track of number of line ports and client ports
int line = 1;
int client = 1;
Integer xponderNb = xponder.getXpdrNumber().toJava();
XpdrNodeTypes xponderType = xponder.getXpdrType();
- for (XpdrPort xpdrPort : xponder.nonnullXpdrPort().values()) {
+ 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().toString();
+ 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("{} : Circuit-pack {} is missing in the device - ignoring it in port-mapping",
- nodeId, circuitPackName);
+ LOG.warn(PortMappingUtils.MISSING_CP_LOGMSG + PortMappingUtils.PORTMAPPING_IGNORE_LOGMSG,
+ nodeId, circuitPackName);
continue;
}
if (device.nonnullCircuitPacks().values().stream()
.findFirst().get().nonnullPorts().values().stream()
.filter(p -> p.getPortName().equals(portName))
.findFirst().isEmpty()) {
- LOG.warn("{} : port {} on {} - association missing in the device - ignoring it in port-mapping",
- nodeId, portName, circuitPackName);
+ LOG.warn(PortMappingUtils.NO_ASSOC_FOUND_LOGMSG + PortMappingUtils.PORTMAPPING_IGNORE_LOGMSG,
+ nodeId, portName, circuitPackName, "in the device");
continue;
}
Ports port = device.nonnullCircuitPacks().values().stream()
}
if (device.getConnectionMap() == null) {
- LOG.warn("{} : No connection-map inside device configuration", nodeId);
+ LOG.warn(PortMappingUtils.NO_CONMAP_LOGMSG, nodeId);
} else {
Collection<ConnectionMap> connectionMap = deviceObject.get().nonnullConnectionMap().values();
for (ConnectionMap cm : connectionMap) {
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 (CP+port) {}",
- nodeId, skey, dkey);
+ LOG.error(PortMappingUtils.CONMAP_ISSUE_LOGMSG, nodeId, skey, dkey);
continue;
}
String dlcp = lcpMap.containsKey(dkey) ? lcpMap.get(dkey) : null;
for (PortList item : nbl.nonnullPortList().values()) {
String key = item.getCircuitPackName() + "+" + item.getPortName();
if (!lcpMap.containsKey(key)) {
- LOG.error("{} : port {} on {} is not associated to a logical connection point",
- nodeId, item.getPortName(), item.getCircuitPackName());
+ LOG.error(PortMappingUtils.NO_ASSOC_FOUND_LOGMSG,
+ nodeId, item.getPortName(), item.getCircuitPackName(), "to a logical connection point");
continue;
}
lcpList.add(lcpMap.get(key));
}
private boolean checkPartnerPortNotNull(Ports port) {
- if (port.getPartnerPort() == null
- || port.getPartnerPort().getCircuitPackName() == null
- || port.getPartnerPort().getPortName() == null) {
- return false;
- }
- return true;
+ return (port.getPartnerPort() != null
+ && port.getPartnerPort().getCircuitPackName() != null
+ && port.getPartnerPort().getPortName() != null);
}
private boolean checkPartnerPortNoDir(String circuitPackName, Ports port1, Ports port2) {
- if (!checkPartnerPortNotNull(port2)
- || !port2.getPartnerPort().getCircuitPackName().equals(circuitPackName)
- || !port2.getPartnerPort().getPortName().equals(port1.getPortName())) {
- return false;
- }
- return true;
+ return (checkPartnerPortNotNull(port2)
+ && port2.getPartnerPort().getCircuitPackName().equals(circuitPackName)
+ && port2.getPartnerPort().getPortName().equals(port1.getPortName()));
}
private boolean checkPartnerPort(String circuitPackName, Ports port1, Ports port2) {
- if (!checkPartnerPortNoDir(circuitPackName, port1, port2)
- || ((Direction.Rx.getIntValue() != port1.getPortDirection().getIntValue()
- || Direction.Tx.getIntValue() != port2.getPortDirection().getIntValue())
- &&
- (Direction.Tx.getIntValue() != port1.getPortDirection().getIntValue()
- || Direction.Rx.getIntValue() != port2.getPortDirection().getIntValue()))) {
- return false;
- }
- return true;
+ 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())));
}
for (int srgCounter = 1; srgCounter <= maxSrg; srgCounter++) {
List<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.srg.CircuitPacks> srgCps
= new ArrayList<>();
- LOG.debug("{} : Getting Circuitpacks for Srg Number {}", deviceId, srgCounter);
+ LOG.debug(PortMappingUtils.GETTING_CP_LOGMSG, deviceId, srgCounter);
InstanceIdentifier<SharedRiskGroup> srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(SharedRiskGroup.class, new SharedRiskGroupKey(Uint16.valueOf(srgCounter)));
Optional<SharedRiskGroup> ordmSrgObject = this.deviceTransactionManager.getDataFromDevice(deviceId,
cpPerSrg.put(ordmSrgObject.get().getSrgNumber().toJava(), srgCps);
}
}
- LOG.info("{} : Device has {} Srg", deviceId, cpPerSrg.size());
+ LOG.info(PortMappingUtils.DEVICE_HAS_LOGMSG, deviceId, cpPerSrg.size(), "SRG");
return cpPerSrg;
}
LogicalDatastoreType.OPERATIONAL, cpIID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
- if (!circuitPackObject.isPresent() || (circuitPackObject.get().getPorts() == null)) {
- LOG.warn("{} : Circuit pack {} not found or without ports.", nodeId, circuitPackName);
+ 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());
Collections.sort(portList, new SortPort221ByName());
int portIndex = 1;
}
if (PortQual.RoadmExternal.getIntValue() != port.getPortQual().getIntValue()) {
- LOG.debug("{} : port {} on {} is not roadm-external - cannot assign logicalConnectionPoint.",
- nodeId, port.getPortName(), circuitPackName);
+ LOG.debug(PortMappingUtils.PORT_NOT_RDMEXT_LOGMSG + PortMappingUtils.CANNOT_AS_LCP_LOGMSG,
+ nodeId, port.getPortName(), circuitPackName);
continue;
}
if (keys.contains(currentKey)) {
- LOG.debug("{} : port {} on {} has already been handled - cannot assign logicalConnectionPoint.",
- nodeId, port.getPortName(), circuitPackName);
+ LOG.debug(PortMappingUtils.PORT_ALREADY_HANDLED_LOGMSG + PortMappingUtils.CANNOT_AS_LCP_LOGMSG,
+ nodeId, port.getPortName(), circuitPackName);
continue;
}
case Bidirectional:
String lcp = createLogicalConnectionPort(port, srgCpEntry.getKey(), portIndex);
- LOG.info("{} : port {} on {} - associated Logical Connection Point is {}",
- nodeId, port.getPortName(), circuitPackName, lcp);
+ LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG,
+ nodeId, port.getPortName(), circuitPackName, lcp);
portMapList.add(createMappingObject(nodeId, port, circuitPackName, lcp));
portIndex++;
keys.add(currentKey);
case Rx:
case Tx:
if (!checkPartnerPortNotNull(port)) {
- LOG.info("{} : port {} on {} is unidirectional but has no valid partnerPort"
- + " - cannot assign logicalConnectionPoint.",
- nodeId, port.getPortName(), circuitPackName);
+ LOG.info(PortMappingUtils.NO_VALID_PARTNERPORT_LOGMSG
+ + PortMappingUtils.CANNOT_AS_LCP_LOGMSG,
+ nodeId, port.getPortName(), circuitPackName);
continue;
}
String lcp1 = createLogicalConnectionPort(port, srgCpEntry.getKey(), portIndex);
- LOG.info("{} : port {} on {} - associated Logical Connection Point is {}",
- nodeId, port.getPortName(), circuitPackName, lcp1);
+ 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().toString()));
+ .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.isPresent()
+ if (port2Object.isEmpty()
|| port2Object.get().getPortQual().getIntValue()
!= PortQual.RoadmExternal.getIntValue()) {
- LOG.error("{} : port {} on {} - error getting partner",
- nodeId, port.getPartnerPort().getPortName().toString(),
- port.getPartnerPort().getCircuitPackName());
+ 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("{} : port {} on {} - Error with partner port configuration",
- nodeId, port.getPortName(), circuitPackName);
+ 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("{} : port {} on {} - associated Logical Connection Point is {}",
+ LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG,
nodeId, port2.getPortName(), circuitPackName, lcp2);
portMapList.add(createMappingObject(nodeId, port, circuitPackName, lcp1));
portMapList.add(
break;
default:
- LOG.error("{} : port {} on {} - unsupported Direction {}"
- + " - cannot assign logicalConnectionPoint.",
- nodeId, port.getPortName(), circuitPackName, port.getPortDirection());
+ LOG.error(PortMappingUtils.UNSUPPORTED_DIR_LOGMSG + PortMappingUtils.CANNOT_AS_LCP_LOGMSG,
+ nodeId, port.getPortName(), circuitPackName, port.getPortDirection());
}
}
if (SUFFIX.containsKey(port.getPortDirection())) {
return String.join("-", "SRG" + index, "PP" + portIndex, SUFFIX.get(port.getPortDirection()));
}
- LOG.error("port {} : Unsupported port direction {}", port, port.getPortDirection());
+ LOG.error(PortMappingUtils.UNSUPPORTED_DIR_LOGMSG,
+ "createLogicalConnectionPort", port, "SRG" + index + "-PP" + portIndex, port.getPortDirection());
return null;
}
- private String createXpdrLogicalConnectionPort(int xponderNb, int lcpNb, String token) {
- return new StringBuilder("XPDR").append(xponderNb)
- .append("-")
- .append(token).append(lcpNb)
- .toString();
- }
-
-
private Map<Integer, Degree> getDegreesMap(String deviceId, Info ordmInfo) {
Map<Integer, Degree> degrees = new HashMap<>();
Integer maxDegree = ordmInfo.getMaxDegrees() == null ? 20 : ordmInfo.getMaxDegrees().toJava();
for (int degreeCounter = 1; degreeCounter <= maxDegree; degreeCounter++) {
- LOG.debug("{} : Getting Connection ports for Degree Number {}", deviceId, degreeCounter);
+ LOG.debug(PortMappingUtils.GETTING_CONPORT_LOGMSG, deviceId, degreeCounter);
InstanceIdentifier<Degree> deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(Degree.class, new DegreeKey(Uint16.valueOf(degreeCounter)));
Optional<Degree> ordmDegreeObject = this.deviceTransactionManager.getDataFromDevice(deviceId,
degrees.put(degreeCounter, ordmDegreeObject.get());
}
}
- LOG.info("{} : Device has {} degree(s)", deviceId, degrees.size());
+ LOG.info(PortMappingUtils.DEVICE_HAS_LOGMSG,
+ deviceId, degrees.size(), degrees.size() <= 1 ? "degree" : "degrees");
return degrees;
}
}
private Map<String, String> getEthInterfaceList(String nodeId) {
- LOG.info("{} : It is calling get ethernet interface", nodeId);
+ LOG.info(PortMappingUtils.GETTING_ETH_LIST_LOGMSG, nodeId);
InstanceIdentifier<Protocols> protocoliid = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(Protocols.class);
Optional<Protocols> protocolObject = this.deviceTransactionManager.getDataFromDevice(nodeId,
LogicalDatastoreType.OPERATIONAL, protocoliid, Timeouts.DEVICE_READ_TIMEOUT,
Timeouts.DEVICE_READ_TIMEOUT_UNIT);
if (!protocolObject.isPresent() || protocolObject.get().augmentation(Protocols1.class).getLldp() == null) {
- LOG.warn("{} : Couldnt find port config under LLDP - Processiong is done.. now returning..", nodeId);
+ LOG.warn(PortMappingUtils.PROCESSING_DONE_LOGMSG, nodeId, PortMappingUtils.CANNOT_GET_LLDP_CONF_LOGMSG);
return new HashMap<>();
}
Map<String, String> cpToInterfaceMap = new HashMap<>();
cpToInterfaceMap.put(circuitPackObject.get().getParentCircuitPack().getCircuitPackName(),
portConfig.getIfName());
}
- LOG.info("{} : Processiong is done.. now returning..", nodeId);
+ LOG.info(PortMappingUtils.PROCESSING_DONE_LOGMSG, nodeId, " - success");
return cpToInterfaceMap;
}
private List<CpToDegree> getCpToDegreeList(Map<Integer, Degree> degrees, Map<String, String> interfaceList) {
List<CpToDegree> cpToDegreeList = new ArrayList<>();
for (Degree degree : degrees.values()) {
- LOG.debug("Inside CP to degree list");
cpToDegreeList.addAll(degree.nonnullCircuitPacks().values().stream()
.map(cp -> createCpToDegreeObject(cp.getCircuitPackName(),
degree.getDegreeNumber().toString(), interfaceList))
private Map<McCapabilitiesKey, McCapabilities> getMcCapabilities(Map<Integer, Degree> degrees,
List<SharedRiskGroup> srgs, String nodeId) {
- LOG.info("{} : Getting the MC capabilities for degrees", nodeId);
+ LOG.info(PortMappingUtils.GETTING_MC_CAPA_LOGMSG , nodeId, "degrees");
Map<McCapabilitiesKey, McCapabilities> mcCapabilities = degrees.values().stream()
.map(degree -> createMcCapDegreeObject(degree, nodeId))
.collect(Collectors.toMap(McCapabilities::key, mcc -> mcc));
// Add the SRG mc-capabilities
- LOG.info("{} : Getting the MC capabilities for SRGs", nodeId);
+ LOG.info(PortMappingUtils.GETTING_MC_CAPA_LOGMSG , nodeId, "SRGs");
mcCapabilities.putAll(srgs.stream().map(srg -> createMcCapSrgObject(srg, nodeId))
.collect(Collectors.toMap(McCapabilities::key, mcCapabilities2 -> mcCapabilities2)));
return mcCapabilities;
commit.get();
return true;
} catch (InterruptedException | ExecutionException e) {
- LOG.warn("{} : Failed to post {}", nodeId, network, e);
+ LOG.warn(PortMappingUtils.PORTMAPPING_POST_FAIL_LOGMSG, nodeId, network, e);
return false;
}
}
}
private McCapabilities createMcCapDegreeObject(Degree degree, String nodeId) {
- String mcNodeName = "DEG" + degree.getDegreeNumber().toString() + "-TTP";
+ String mcNodeName = PortMappingUtils.degreeTtpNodeName(degree.getDegreeNumber().toString(), null);
McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder()
.withKey(new McCapabilitiesKey(mcNodeName))
.setMcNodeName(mcNodeName);
if (degree.getMcCapabilities() == null) {
- LOG.warn("{} : Media channel capabilities are not advertised for degree {} - assuming fixed grid",
- nodeId, degree.getDegreeNumber());
+ LOG.warn(PortMappingUtils.NO_MC_LOGMSG, nodeId, "degree", degree.getDegreeNumber());
mcCapabilitiesBuilder
.setCenterFreqGranularity(FrequencyGHz.getDefaultInstance("50"))
.setSlotWidthGranularity(FrequencyGHz.getDefaultInstance("50"));
.withKey(new McCapabilitiesKey(mcNodeName))
.setMcNodeName(mcNodeName);
if (srg.getMcCapabilities() == null) {
- LOG.warn("{} : Media channel capabilities are not advertised for SRG {} - assuming fixed grid",
- nodeId, srg.getSrgNumber());
+ LOG.warn(PortMappingUtils.NO_MC_LOGMSG, nodeId, "SRG", srg.getSrgNumber());
mcCapabilitiesBuilder
.setCenterFreqGranularity(FrequencyGHz.getDefaultInstance("50"))
.setSlotWidthGranularity(FrequencyGHz.getDefaultInstance("50"));
.setSupportingCircuitPackName(circuitPackName)
.setSupportingPort(port.getPortName())
.setPortDirection(port.getPortDirection().getName());
+ if (port.getAdministrativeState() != null) {
+ mpBldr.setPortAdminState(port.getAdministrativeState().name());
+ }
+ if (port.getOperationalState() != null) {
+ mpBldr.setPortOperState(port.getOperationalState().name());
+ }
if ((port.getInterfaces() == null)
|| (!logicalConnectionPoint.contains(StringConstants.TTP_TOKEN)
&& !logicalConnectionPoint.contains(StringConstants.NETWORK_TOKEN))) {
return mpBldr.build();
}
- // Get OMS and OTS interface provisioned on the TTP's
+ mpBldr = updateMappingInterfaces(nodeId, mpBldr, port);
+ return mpBldr.build();
+ }
+
+ 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))) {
+ return mpBldr.build();
+ }
+ // Get interfaces provisioned on the port
+ mpBldr = updateMappingInterfaces(nodeId, mpBldr, port);
+ return mpBldr.build();
+ }
+
+ private MappingBuilder updateMappingStates(MappingBuilder mpBldr, Ports port, Mapping oldmapping) {
+ if (port.getAdministrativeState() != null
+ && !port.getAdministrativeState().getName().equals(oldmapping.getPortAdminState())) {
+ mpBldr.setPortAdminState(port.getAdministrativeState().name());
+ }
+ if (port.getOperationalState() != null
+ && !port.getOperationalState().getName().equals(oldmapping.getPortOperState())) {
+ mpBldr.setPortOperState(port.getOperationalState().name());
+ }
+ return mpBldr;
+ }
+
+ private MappingBuilder updateMappingInterfaces(String nodeId, MappingBuilder mpBldr, Ports port) {
for (Interfaces interfaces : port.getInterfaces()) {
try {
Optional<Interface> openRoadmInterface = this.openRoadmInterfaces.getInterface(nodeId,
interfaces.getInterfaceName());
- if (!openRoadmInterface.isPresent()) {
- LOG.warn("{} : Interface {} was null!", nodeId, interfaces.getInterfaceName());
+ if (openRoadmInterface.isEmpty()) {
+ LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG,
+ nodeId, interfaces.getInterfaceName() + "- empty interface");
continue;
}
- LOG.debug("{} : interface get from device is {} and of type {}",
+ LOG.debug(PortMappingUtils.GOT_INTF_LOGMSG,
nodeId, openRoadmInterface.get().getName(), openRoadmInterface.get().getType());
Class<? extends InterfaceType> interfaceType
= (Class<? extends InterfaceType>) openRoadmInterface.get().getType();
mpBldr.setSupportingOdu4(interfaces.getInterfaceName());
}
} catch (OpenRoadmInterfaceException ex) {
- LOG.warn("{} : Error while getting interface {} - ",
- nodeId, interfaces.getInterfaceName(), ex);
+ LOG.warn(PortMappingUtils.INTF_ISSUE_LOGMSG, nodeId, interfaces.getInterfaceName(), ex);
}
}
- return mpBldr.build();
+ return mpBldr;
}
private Mapping createXpdrMappingObject(String nodeId, Ports port, String circuitPackName,
.setSupportingCircuitPackName(circuitPackName)
.setSupportingPort(port.getPortName())
.setPortDirection(port.getPortDirection().getName())
- .setLcpHashVal(FnvUtils.fnv1_64(nodeIdLcp));
+ .setLcpHashVal(PortMappingUtils.fnv1size64(nodeIdLcp));
if (port.getPortQual() != null) {
mpBldr.setPortQual(port.getPortQual().getName());
}
List<Class<? extends org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327
.SupportedIfCapability>> supportedIntf = new ArrayList<>();
for (Class<? extends SupportedIfCapability> sup: port.getSupportedInterfaceCapability()) {
- @SuppressWarnings("unchecked") Class<? extends
- org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.SupportedIfCapability> sup1 =
- (Class<? extends org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327
- .SupportedIfCapability>) sup;
- supportedIntf.add(sup1);
+ supportedIntf.add(MappingUtilsImpl.convertSupIfCapa(sup.getSimpleName()));
}
mpBldr.setSupportedInterfaceCapability(supportedIntf);
}
+ if (port.getAdministrativeState() != null) {
+ mpBldr.setPortAdminState(port.getAdministrativeState().name());
+ }
+ if (port.getOperationalState() != null) {
+ mpBldr.setPortOperState(port.getOperationalState().name());
+ }
return mpBldr.build();
}
//circuitPackName2 will be updated by reference contrary to circuitPackName
List<CircuitPacks> circuitPackList, Map<String, String> lcpMap) {
if (!checkPartnerPortNotNull(port)) {
- LOG.warn("{} : port {} on {} - Error in the configuration ",
- nodeId, port.getPortName(), circuitPackName);
+ LOG.warn(PortMappingUtils.NO_VALID_PARTNERPORT_LOGMSG, nodeId, port.getPortName(), circuitPackName);
return null;
}
if (lcpMap.containsKey(circuitPackName + '+' + port.getPortName())) {
.filter(
cP -> cP.getCircuitPackName().equals(port.getPartnerPort().getCircuitPackName()))
.findFirst();
- if (!cpOpt.isPresent()) {
- LOG.error("{} : Error fetching circuit-pack {}",
- nodeId, port.getPartnerPort().getCircuitPackName());
+ if (cpOpt.isEmpty()) {
+ LOG.error(PortMappingUtils.MISSING_CP_LOGMSG, nodeId, port.getPartnerPort().getCircuitPackName());
return null;
}
Optional<Ports> poOpt = cpOpt.get().nonnullPorts().values().stream()
- .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName().toString()))
+ .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName()))
.findFirst();
- if (!poOpt.isPresent()) {
- LOG.error("{} : Error fetching port {} on {}",
- nodeId, port.getPartnerPort().getPortName(), port.getPartnerPort().getCircuitPackName());
+ if (poOpt.isEmpty()) {
+ LOG.error(PortMappingUtils.NO_PORT_ON_CP_LOGMSG,
+ nodeId, port.getPartnerPort().getPortName(), port.getPartnerPort().getCircuitPackName());
return null;
}
Ports port2 = poOpt.get();
circuitPackName2.append(cpOpt.get().getCircuitPackName());
if (!checkPartnerPort(circuitPackName, port, port2)) {
- LOG.error("{} : port {} on {} is not a correct partner port of {} on {}",
- nodeId, port2.getPortName(), circuitPackName2, port.getPortName(), circuitPackName);
+ LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG,
+ nodeId, port2.getPortName(), circuitPackName2, port.getPortName(), circuitPackName);
return null;
}
return port2;
Integer xponderNb, XpdrNodeTypes xponderType,
String circuitPackName, String circuitPackName2, Ports port, Ports port2,
Map<String, String> lcpMap, Map<String, Mapping> mappingMap) {
- String lcp1 = createXpdrLogicalConnectionPort(xponderNb, line, StringConstants.NETWORK_TOKEN);
- String lcp2 = createXpdrLogicalConnectionPort(xponderNb, line + 1, StringConstants.NETWORK_TOKEN);
- if (lcpMap.containsKey(lcp1) || lcpMap.containsKey(lcp2)) {
- LOG.warn("{} : mapping already exists for {} or {}", nodeId, lcp1, lcp2);
+ String lcp1 =
+ PortMappingUtils.createXpdrLogicalConnectionPort(xponderNb, line, StringConstants.NETWORK_TOKEN);
+ if (lcpMap.containsKey(lcp1)) {
+ LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, "add", lcp1 + " - already exist");
+ return;
+ }
+ String lcp2 =
+ PortMappingUtils.createXpdrLogicalConnectionPort(xponderNb, line + 1, StringConstants.NETWORK_TOKEN);
+ if (lcpMap.containsKey(lcp2)) {
+ LOG.warn(PortMappingUtils.UNABLE_MAPPING_LOGMSG, nodeId, "add", lcp2 + " - already exist");
return;
}
lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1);
String circuitPackName, Ports port,
List<CircuitPacks> circuitPackList, Map<String, String> lcpMap, Map<String, Mapping> mappingMap) {
if (port.getPortQual() == null) {
- LOG.warn("{} : port {} on {} - PortQual was not found",
- nodeId, port.getPortName(), circuitPackName);
+ LOG.warn(PortMappingUtils.PORTQUAL_LOGMSG, nodeId, port.getPortName(), circuitPackName, "not found");
return new int[] {line, client};
}
case XpdrClient:
case SwitchClient:
- String lcp0 = createXpdrLogicalConnectionPort(xponderNb, client, StringConstants.CLIENT_TOKEN);
+ String lcp0 =
+ 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));
break;
default:
- LOG.error("{} : port {} on {} - unsupported PortQual {}",
- nodeId, port.getPortName(), circuitPackName, port.getPortQual());
+ LOG.error(PortMappingUtils.PORTQUAL_LOGMSG,
+ nodeId, port.getPortName(), circuitPackName, port.getPortQual() + " not supported");
}
return new int[] {line, client};
}
switch (port.getPortDirection()) {
case Bidirectional:
- String lcp = createXpdrLogicalConnectionPort(xponderNb, line, StringConstants.NETWORK_TOKEN);
+ String lcp =
+ PortMappingUtils.createXpdrLogicalConnectionPort(xponderNb, line, StringConstants.NETWORK_TOKEN);
lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp);
mappingMap.put(lcp,
createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, null, xponderType));
break;
default:
- LOG.error("{} : port {} on {} - unsupported Direction {}",
- nodeId, port.getPortName(), circuitPackName, port.getPortDirection());
+ LOG.error(PortMappingUtils.UNSUPPORTED_DIR_LOGMSG,
+ nodeId, port.getPortName(), circuitPackName, port.getPortDirection());
}
return line;
Map<Integer, Degree> degrees = getDegreesMap(nodeId, deviceInfo);
Map<String, String> interfaceList = getEthInterfaceList(nodeId);
List<CpToDegree> cpToDegreeList = getCpToDegreeList(degrees, interfaceList);
- LOG.info("{} : Map looks like this {}", nodeId, interfaceList);
+ LOG.info(PortMappingUtils.MAP_LOOKS_LOGMSG, nodeId, interfaceList);
postPortMapping(nodeId, null, null, cpToDegreeList, null, null);
Map<Integer, List<ConnectionPorts>> connectionPortMap = getPerDegreePorts(nodeId, deviceInfo);
switch (connectionPortMap.get(cpMapEntry.getKey()).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(connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName()))
+ .child(CircuitPacks.class, new CircuitPacksKey(cpName))
.child(Ports.class,
- new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString()));
- LOG.debug("{} : Fetching connection-port {} at circuit pack {}",
- nodeId,
- connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(),
- connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName());
+ 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("{} : No port {} on circuit pack {}",
- nodeId,
- connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(),
- connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName());
+ LOG.error(PortMappingUtils.NO_PORT_ON_CP_LOGMSG,
+ nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), cpName);
return false;
}
Ports port = portObject.get();
if (port.getPortQual() == null) {
continue;
}
- if (PortQual.RoadmExternal.getIntValue() != port.getPortQual().getIntValue()
- || Direction.Bidirectional.getIntValue() != port.getPortDirection().getIntValue()) {
- LOG.error("{} : port {} on {} - Impossible to create logical connection point"
- + " - Error in configuration with port-qual or port-direction",
- nodeId, port.getPortName(),
- connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName());
+ 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 = new StringBuilder("DEG")
- .append(cpMapEntry.getKey())
- .append("-TTP-TXRX")
- .toString();
- 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));
+
+ 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));
break;
case 2:
// ports are unidirectionals
InstanceIdentifier<Ports> port1ID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(CircuitPacks.class, new CircuitPacksKey(cp1Name))
.child(Ports.class,
- new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString()));
- LOG.debug("{} : Fetching connection-port {} at circuit pack {}",
- nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), cp1Name);
+ 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().toString()));
- LOG.debug("{} : Fetching connection-port {} at circuit pack {}",
- nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName(), cp2Name);
+ 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("{} : No port {} on circuit pack {}",
- nodeId,
- connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(),
- connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName());
+ LOG.error(PortMappingUtils.NO_PORT_ON_CP_LOGMSG,
+ nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), cp1Name);
+ return false;
+ }
+ if (!port2Object.isPresent()) {
+ LOG.error(PortMappingUtils.NO_PORT_ON_CP_LOGMSG,
+ nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName(), cp2Name);
return false;
}
if (port1.getPortQual() == null || port2.getPortQual() == null) {
continue;
}
- 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 {}"
- + " - Error in configuration with port-qual",
- nodeId, port1.getPortName(), port2.getPortName());
+ 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("{} : port {} on {} is not a correct partner port of {} on {}",
- nodeId, port2.getPortName(), cp2Name, port1.getPortName(), cp1Name);
+ 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("{} : port {} on {} is not a correct partner port of {} on {}",
- nodeId, port1.getPortName(), cp1Name, port2.getPortName(), cp2Name);
+ LOG.error(PortMappingUtils.NOT_CORRECT_PARTNERPORT_LOGMSG,
+ nodeId, port1.getPortName(), cp1Name, port2.getPortName(), cp2Name);
continue;
}
- String logicalConnectionPoint1 = new StringBuilder("DEG")
- .append(cpMapEntry.getKey())
- .append("-TTP-")
- .append(port1.getPortDirection().getName().toUpperCase(Locale.getDefault()))
- .toString();
- LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId,
- connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(),
- port1.getPortName(), logicalConnectionPoint1);
- portMapList.add(createMappingObject(nodeId, port1,
- connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(),
- logicalConnectionPoint1));
- String logicalConnectionPoint2 = new StringBuilder("DEG")
- .append(cpMapEntry.getKey())
- .append("-TTP-")
- .append(port2.getPortDirection().getName().toUpperCase(Locale.getDefault()))
- .toString();
- LOG.info("{} : Logical Connection Point for {} {} is {}",
- nodeId,
- connectionPortMap.get(cpMapEntry.getKey()).get(1).getCircuitPackName(),
- port2.getPortName(), logicalConnectionPoint2);
- portMapList.add(createMappingObject(nodeId, port2,
- connectionPortMap.get(cpMapEntry.getKey()).get(1).getCircuitPackName(),
- logicalConnectionPoint2));
+ String logicalConnectionPoint1 = PortMappingUtils.degreeTtpNodeName(cpMapEntry.getKey().toString(),
+ port1.getPortDirection().getName().toUpperCase(Locale.getDefault()));
+ LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG,
+ nodeId, port1.getPortName(), cp1Name, logicalConnectionPoint1);
+ portMapList.add(createMappingObject(nodeId, port1, cp1Name, logicalConnectionPoint1));
+ String logicalConnectionPoint2 = PortMappingUtils.degreeTtpNodeName(cpMapEntry.getKey().toString(),
+ port2.getPortDirection().getName().toUpperCase(Locale.getDefault()));
+ LOG.info(PortMappingUtils.ASSOCIATED_LCP_LOGMSG,
+ nodeId, port2.getPortName(), cp2Name, logicalConnectionPoint2);
+ portMapList.add(createMappingObject(nodeId, port2, cp2Name, logicalConnectionPoint2));
break;
default:
- LOG.error("{} : Number of connection port for DEG{} is incorrect", nodeId, cpMapEntry.getKey());
+ LOG.error(PortMappingUtils.NOT_CORRECT_CONPORT_LOGMSG, nodeId, cpMapEntry.getKey());
continue;
}
}
if (deviceInfo.getNodeType() == null) {
// TODO make mandatory in yang
- LOG.error("Node type field is missing");
+ LOG.error(PortMappingUtils.NODE_TYPE_LOGMSG, deviceInfo.getNodeId(), "field missing");
return null;
}
NodeInfoBuilder nodeInfoBldr = new NodeInfoBuilder()
- .setOpenroadmVersion(OpenroadmVersion._221)
+ .setOpenroadmVersion(OpenroadmNodeVersion._221)
.setNodeType(NodeTypes.forValue(deviceInfo.getNodeType().getIntValue()));
if (deviceInfo.getClli() != null && !deviceInfo.getClli().isEmpty()) {
nodeInfoBldr.setNodeClli(deviceInfo.getClli());
Code Review / transportpce.git / blobdiff