import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterfaces;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.NodeTypes;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.circuit.pack.Ports;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.circuit.pack.PortsKey;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.circuit.packs.CircuitPacks;
DataBroker deviceDb = getDeviceDataBroker(nodeId, mps);
List<Mapping> portMapList = new ArrayList<>();
Info deviceInfo;
+ Integer nodeType = 1;
if (deviceDb != null) {
deviceInfo = getDeviceInfo(deviceDb);
if (deviceInfo != null) {
LOG.info("Node type mandatory field is missing");
return false;
}
- Integer nodeType = deviceInfo.getNodeType().getIntValue();
+ nodeType = deviceInfo.getNodeType().getIntValue();
// Create Mapping for Roadm Node
if (nodeType == 1) {
// Get TTP port mapping
LOG.info("Unable to get Data broker for node " + nodeId);
return false;
}
- return postPortMapping(deviceInfo, portMapList);
+ return postPortMapping(deviceInfo, portMapList, nodeType);
}
/**
try {
Optional<Info> ordmInfoObject = rtx.read(LogicalDatastoreType.OPERATIONAL, infoIID).get();
if (ordmInfoObject.isPresent()) {
+ LOG.info("Info subtree is present {}", ordmInfoObject.get());
return ordmInfoObject.get();
} else {
- LOG.info("Info subtree is not present");
+ LOG.error("Info subtree is not present");
}
+ } catch (NullPointerException ex) {
+ LOG.warn("Try to get Info from a non Open ROADM device {}", deviceDb);
+ return null;
} catch (InterruptedException | ExecutionException ex) {
- LOG.info("Read failed on info subtree ",ex);
+ LOG.error("Read failed on info subtree ", ex);
return null;
}
return null;
Optional<Degree> ordmDegreeObject = rtx.read(LogicalDatastoreType.CONFIGURATION, deviceIID).get();
if (ordmDegreeObject.isPresent()) {
- degreeConPorts.addAll(new ArrayList<ConnectionPorts>(ordmDegreeObject.get().getConnectionPorts()));
+ degreeConPorts.addAll(new ArrayList<>(ordmDegreeObject.get().getConnectionPorts()));
} else {
LOG.info("Device has " + (degreeCounter - 1) + " degree");
break;
}
} catch (InterruptedException | ExecutionException ex) {
- LOG.info("Failed to read degree " + degreeCounter,ex);
+ LOG.error("Failed to read degree " + degreeCounter,ex);
break;
}
if (ordmSrgObject.isPresent()) {
srgCps.addAll(
- new ArrayList<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.srg
- .CircuitPacks>(ordmSrgObject.get().getCircuitPacks()));
+ new ArrayList<>(ordmSrgObject.get().getCircuitPacks()));
} else {
LOG.info("Device has " + (srgCounter - 1) + " Srg");
*
* @return Result true/false based on status of operation.
*/
- private boolean postPortMapping(Info deviceInfo, List<Mapping> portMapList) {
+ private boolean postPortMapping(Info deviceInfo, List<Mapping> portMapList, Integer nodeType) {
- List<Nodes> nodesList = new ArrayList<>();
NodesBuilder nodesBldr = new NodesBuilder();
nodesBldr.setKey(new NodesKey(deviceInfo.getNodeId())).setNodeId(deviceInfo.getNodeId());
+ nodesBldr.setNodeType(NodeTypes.forValue(nodeType));
nodesBldr.setMapping(portMapList);
+ List<Nodes> nodesList = new ArrayList<>();
nodesList.add(nodesBldr.build());
NetworkBuilder nwBldr = new NetworkBuilder();
nwBldr.setNodes(nodesList);
* Unique Identifier for the node of interest.
* @param logicalConnPoint
* Name of the logical point
+ * @param db
+ * Databroker / MD-SAL data store
*
* @return Result Mapping object if success otherwise null.
*/
return null;
}
} catch (InterruptedException | ExecutionException ex) {
- LOG.info("Unable to read mapping for logical connection point : " + logicalConnPoint + " for nodeId "
+ LOG.error("Unable to read mapping for logical connection point : " + logicalConnPoint + " for nodeId "
+ nodeId,ex);
}
return null;
DataBroker netconfNodeDataBroker = netconfNode.getService(DataBroker.class).get();
return netconfNodeDataBroker;
} else {
- LOG.info("Device Data broker not found for :" + nodeId);
+ LOG.error("Device Data broker not found for :" + nodeId);
return null;
}
}
MountPoint netconfNode = netconfNodeOptional.get();
return netconfNode;
} else {
- LOG.info("Mount Point not found for :" + nodeId);
+ LOG.error("Mount Point not found for :" + nodeId);
return null;
}
}
-
-}
\ No newline at end of file
+}