import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.NodesKey;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
ServicePathInputBuilder servicePathInputBuilder = new ServicePathInputBuilder()
.setServiceName(serviceName)
.setOperation(ServicePathInput.Operation.Create)
- .setWaveNumber(Long.valueOf(pathDescription.getAToZDirection().getAToZWavelengthNumber().toJava()))
.setNodes(nodeLists.getList());
+ if (pathDescription.getAToZDirection().getAToZWavelengthNumber() != null) {
+ servicePathInputBuilder
+ .setWaveNumber(Uint32.valueOf(pathDescription.getAToZDirection().getAToZWavelengthNumber().toJava()));
+ }
return new ServicePathInputData(servicePathInputBuilder.build(), nodeLists);
}
ServicePathInputBuilder servicePathInputBuilder = new ServicePathInputBuilder()
.setOperation(ServicePathInput.Operation.Create)
.setServiceName(serviceName)
- .setWaveNumber(Long.valueOf(pathDescription.getZToADirection().getZToAWavelengthNumber().toJava()))
.setNodes(nodeLists.getList());
+ if (pathDescription.getAToZDirection().getAToZWavelengthNumber() != null) {
+ servicePathInputBuilder
+ .setWaveNumber(Uint32.valueOf(pathDescription.getAToZDirection().getAToZWavelengthNumber().toJava()));
+ }
return new ServicePathInputData(servicePathInputBuilder.build(), nodeLists);
}
// If atoZ is set true use A-to-Z direction otherwise use Z-to-A
List<org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.otn.renderer.input.Nodes> nodes =
new ArrayList<>();
- NodeLists nodeLists = null;
- if (asideToZside) {
- nodeLists = getNodesListAToZ(pathDescription.getAToZDirection().getAToZ().iterator());
- } else {
+ NodeLists nodeLists = getNodesListAToZ(pathDescription.getAToZDirection().getAToZ().iterator());
+ if (!asideToZside) {
nodeLists = getNodesListZtoA(pathDescription.getZToADirection().getZToA().iterator());
}
LOG.info("These are node-lists {}, {}", nodeLists.getList(), nodeLists.getOlmList());
- for (int i = 0; i < nodeLists.getList().size(); i++) {
- Nodes node = nodeLists.getList().get(i);
- if (serviceRate.equals("100G")) {
- nodes.add(
+ for (Nodes node: nodeLists.getList()) {
+ nodes.add(
new org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.otn.renderer.input
.NodesBuilder()
- .setNodeId(node.getNodeId())
- .setNetworkTp(node.getDestTp())
- .build());
- }
- else { // For any other service rate (1G or 10G)
- // For the last node in the list, clientTp and NetworkTp has to be reversed
- if (i == nodeLists.getList().size() - 1) {
- nodes.add(
- new org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.otn.renderer.input
- .NodesBuilder()
- .setNodeId(node.getNodeId())
- .setClientTp(node.getDestTp())
- .setNetworkTp(node.getSrcTp())
- .build());
-
- } else {
- nodes.add(
- new org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.otn.renderer.input
- .NodesBuilder()
.setNodeId(node.getNodeId())
.setClientTp(node.getSrcTp())
.setNetworkTp(node.getDestTp())
.build());
- }
- }
}
OtnServicePathInputBuilder otnServicePathInputBuilder = new OtnServicePathInputBuilder()
.setServiceName(serviceName)
.setServiceRate(serviceRate)
.setNodes(nodes);
- //TODO: set the trib-slots and trib-ports for the lower oder odu, this should from SH rather than setting here
+ // set the trib-slots and trib-ports for the lower oder odu
if (serviceRate.equals("1G") || (serviceRate.equals("10G"))) {
- otnServicePathInputBuilder.setTribPortNumber((short) 1).setTribSlot((short) 1);
-
+ otnServicePathInputBuilder
+ .setTribPortNumber(pathDescription.getAToZDirection().getTribPortNumber().shortValue())
+ .setTribSlot(pathDescription.getAToZDirection().getTribSlotNumber().shortValue());
}
return otnServicePathInputBuilder.build();
}
return new ServicePathInputBuilder().setServiceName(serviceName).build();
}
- public static NodeLists getNodesListZtoA(Iterator<ZToA> iterator) {
+ private static NodeLists getNodesListZtoA(Iterator<ZToA> iterator) {
Map<Integer, NodeIdPair> treeMap = new TreeMap<>();
List<Nodes> olmList = new ArrayList<>();
List<Nodes> list = new ArrayList<>();
LOG.info(" TP is {} {}", tp.getTpId(),
tp.getTpNodeId());
tpID = tp.getTpId();
- nodeID = tp.getTpNodeId();
sortId = pathDesObj.getId();
//TODO: do not rely on ID to be in certain format
if (tpID.contains("CTP") || tpID.contains("CP")) {
continue;
}
- if (!tpID.contains("TTP") && !tpID.contains("PP") && !tpID.contains("NETWORK")
- && !tpID.contains("CLIENT")) {
+ if (tpID.contains(StringConstants.TTP_TOKEN)) {
+ nodeID = tp.getTpNodeId().split("-DEG")[0];
+ } else if (tpID.contains(StringConstants.PP_TOKEN)) {
+ nodeID = tp.getTpNodeId().split("-SRG")[0];
+ } else if (tpID.contains(StringConstants.NETWORK_TOKEN)
+ || tpID.contains(StringConstants.CLIENT_TOKEN) || tpID.isEmpty()) {
+ nodeID = tp.getTpNodeId().split("-XPDR")[0];
+ } else {
continue;
}
-
- int[] pos = findTheLongestSubstring(nodeID, tpID);
- if (pos != null) {
- //TODO: do not rely on nodeId to be integer
- int id = Integer.parseInt(sortId);
- treeMap.put(id, new NodeIdPair(nodeID.substring(0, pos[0] - 1), tpID));
- }
+ int id = Integer.parseInt(sortId);
+ treeMap.put(id, new NodeIdPair(nodeID, tpID));
} else if ("Link".equals(resourceType)) {
LOG.info("The type is link");
} else {
LOG.error("Dont find the getResource method", e);
}
}
- populateNodeLists(treeMap, list, olmList);
+ populateNodeLists(treeMap, list, olmList, false);
return new NodeLists(olmList, list);
}
- public static NodeLists getNodesListAToZ(Iterator<AToZ> iterator) {
+ private static NodeLists getNodesListAToZ(Iterator<AToZ> iterator) {
Map<Integer, NodeIdPair> treeMap = new TreeMap<>();
List<Nodes> list = new ArrayList<>();
List<Nodes> olmList = new ArrayList<>();
LOG.info("TP is {} {}", tp.getTpId(),
tp.getTpNodeId());
tpID = tp.getTpId();
- nodeID = tp.getTpNodeId();
sortId = pathDesObj.getId();
//TODO: do not rely on ID to be in certain format
if (tpID.contains("CTP") || tpID.contains("CP")) {
continue;
}
- if (!tpID.contains(StringConstants.TTP_TOKEN)
- && !tpID.contains(StringConstants.PP_TOKEN)
- && !tpID.contains(StringConstants.NETWORK_TOKEN)
- && !tpID.contains(StringConstants.CLIENT_TOKEN)) {
+ if (tpID.contains(StringConstants.TTP_TOKEN)) {
+ nodeID = tp.getTpNodeId().split("-DEG")[0];
+ } else if (tpID.contains(StringConstants.PP_TOKEN)) {
+ nodeID = tp.getTpNodeId().split("-SRG")[0];
+ } else if (tpID.contains(StringConstants.NETWORK_TOKEN)
+ || tpID.contains(StringConstants.CLIENT_TOKEN) || tpID.isEmpty()) {
+ nodeID = tp.getTpNodeId().split("-XPDR")[0];
+ } else {
continue;
}
-
- int[] pos = findTheLongestSubstring(nodeID, tpID);
- if (pos != null) {
- //TODO: do not rely on nodeId to be integer
- int id = Integer.parseInt(sortId);
- treeMap.put(id, new NodeIdPair(nodeID.substring(0, pos[0] - 1), tpID));
- }
+ int id = Integer.parseInt(sortId);
+ treeMap.put(id, new NodeIdPair(nodeID, tpID));
} else if ("Link".equals(resourceType)) {
LOG.info("The type is link");
} else {
LOG.error("Did not find the getResource method", e);
}
}
- populateNodeLists(treeMap, list, olmList);
+ populateNodeLists(treeMap, list, olmList, true);
return new NodeLists(olmList, list);
}
@edu.umd.cs.findbugs.annotations.SuppressFBWarnings(
- value = {"NP_LOAD_OF_KNOWN_NULL_VALUE","RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE"},
- justification = "loop when value is not always null - "
- + "TODO: check if something exists in Java lib")
- private static void populateNodeLists(Map<Integer, NodeIdPair> treeMap,
- List<Nodes> list, List<Nodes> olmList) {
+ value = {"NP_LOAD_OF_KNOWN_NULL_VALUE","RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE"},
+ justification = "loop when value is not always null - "
+ + "TODO: check if something exists in Java lib")
+ private static void populateNodeLists(Map<Integer, NodeIdPair> treeMap, List<Nodes> list, List<Nodes> olmList,
+ boolean isAToz) {
String desID = null;
String srcID = null;
- int cnt = 0; // This is a counter to check for NETWORK_TOKEN
+ LOG.info("treeMap values = {}", treeMap.values());
for (NodeIdPair values : treeMap.values()) {
- cnt++;
if (srcID == null) {
srcID = values.getTpID();
- // This code is added in support of OTU4 service
- if ((srcID.contains(StringConstants.NETWORK_TOKEN)) && cnt == 1) {
- NodesBuilder nb = new NodesBuilder()
- .withKey(new NodesKey(values.getNodeID()))
- .setDestTp(srcID) // desTp is assigned to the srcID
- .setSrcTp(null); // srcTp is set to null to create OTU service
- list.add(nb.build());
-
- NodesBuilder olmNb = new NodesBuilder()
- .setNodeId(values.getNodeID())
- .setDestTp(srcID) // desTp is assigned to the srcID
- .setSrcTp(null); // srcTp is set to null to create OTU service
- olmList.add(olmNb.build());
- srcID = null;
- desID = null;
- continue; // Continue to the next element in the for loop
- }
- if ((srcID.contains(StringConstants.NETWORK_TOKEN)) && cnt == treeMap.size()) {
- // For last node
- NodesBuilder nb = new NodesBuilder()
- .withKey(new NodesKey(values.getNodeID()))
- .setDestTp(srcID) //TODO: check this assignment
- .setSrcTp(null); //
- list.add(nb.build());
-
- NodesBuilder olmNb = new NodesBuilder()
- .setNodeId(values.getNodeID())
- .setDestTp(null) // In the case of final node, destTp is set to null
- .setSrcTp(srcID); // srcTp is srcTp
- olmList.add(olmNb.build());
- srcID = null;
- desID = null;
- }
- // End of code for support of ODT4 service
} else if (desID == null) {
desID = values.getTpID();
- NodesBuilder nb = new NodesBuilder()
- .withKey(new NodesKey(values.getNodeID()))
- .setDestTp(desID)
- .setSrcTp(srcID);
- list.add(nb.build());
-
NodesBuilder olmNb = new NodesBuilder()
.setNodeId(values.getNodeID())
.setDestTp(desID)
.setSrcTp(srcID);
olmList.add(olmNb.build());
+ if (srcID.isEmpty()) {
+ srcID = null;
+ }
+ if (desID.isEmpty()) {
+ desID = new StringBuilder(srcID).toString();
+ srcID = null;
+ }
+ if (isAToz) {
+ NodesBuilder nb = new NodesBuilder()
+ .withKey(new NodesKey(values.getNodeID()))
+ .setDestTp(desID)
+ .setSrcTp(srcID);
+ if (srcID != null && desID != null && srcID.contains(StringConstants.NETWORK_TOKEN)) {
+ nb.setDestTp(srcID).setSrcTp(desID);
+ }
+ list.add(nb.build());
+ } else {
+ if (srcID != null && desID != null && !srcID.contains(StringConstants.NETWORK_TOKEN)
+ && !desID.contains(StringConstants.NETWORK_TOKEN)) {
+ NodesBuilder nb = new NodesBuilder()
+ .withKey(new NodesKey(values.getNodeID()))
+ .setDestTp(desID)
+ .setSrcTp(srcID);
+ list.add(nb.build());
+ }
+ }
srcID = null;
desID = null;
} else {
}
}
+
@edu.umd.cs.findbugs.annotations.SuppressFBWarnings(
value = "PZLA_PREFER_ZERO_LENGTH_ARRAYS",
justification = "not relevant to return and zero length array"