import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.TreeMap;
+import java.util.stream.Collectors;
+import org.opendaylight.transportpce.common.NodeIdPair;
import org.opendaylight.transportpce.common.StringConstants;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev200128.OtnServicePathInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev200128.OtnServicePathInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev200128.ServicePathInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev200128.ServicePathInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125.ServiceDeleteOutput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125.ServiceDeleteOutputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125.ServiceImplementationRequestInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125.ServiceImplementationRequestOutput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev201125.ServiceImplementationRequestOutputBuilder;
+import org.opendaylight.transportpce.common.fixedflex.GridConstant;
+import org.opendaylight.transportpce.common.fixedflex.GridUtils;
+import org.opendaylight.transportpce.common.mapping.PortMappingUtils;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.Action;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.OtnServicePathInput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.OtnServicePathInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.ServicePathInput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.ServicePathInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.az.api.info.AEndApiInfo;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.az.api.info.AEndApiInfoBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.az.api.info.ZEndApiInfo;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev211004.az.api.info.ZEndApiInfoBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerSetupInput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerSetupInputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteOutput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteOutputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceImplementationRequestInput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceImplementationRequestOutput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceImplementationRequestOutputBuilder;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.configuration.response.common.ConfigurationResponseCommon;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.configuration.response.common.ConfigurationResponseCommonBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.FrequencyGHz;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.FrequencyTHz;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.ModulationFormat;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.OpucnTribSlotDef;
import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceDeleteInput;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.PathDescription;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.atoz.direction.AToZ;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.ztoa.direction.ZToA;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.pce.resource.resource.resource.TerminationPoint;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.NodesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200615.olm.renderer.input.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.PathDescription;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.AToZDirection;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ZToADirection;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.atoz.direction.AToZ;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ztoa.direction.ZToA;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.Resource;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.Link;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.TerminationPoint;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618.optical.renderer.nodes.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618.optical.renderer.nodes.NodesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618.optical.renderer.nodes.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.LoggerFactory;
-
public final class ModelMappingUtils {
private static final Logger LOG = LoggerFactory.getLogger(ModelMappingUtils.class);
private static final String TERMINATION_POINT = "TerminationPoint";
+ private static final String LINK = "Link";
private ModelMappingUtils() {
}
public static ServicePowerSetupInput createServicePowerSetupInput(List<Nodes> olmList,
- ServiceImplementationRequestInput input) {
- ServicePowerSetupInputBuilder olmSetupBldr = new ServicePowerSetupInputBuilder()
- .setNodes(olmList);
+ ServiceImplementationRequestInput input) {
+ ServicePowerSetupInputBuilder olmSetupBldr = new ServicePowerSetupInputBuilder().setNodes(olmList);
if (input != null && input.getPathDescription() != null
&& input.getPathDescription().getAToZDirection() != null) {
- olmSetupBldr.setWaveNumber(
- input.getPathDescription().getAToZDirection().getAToZWavelengthNumber());
+ AToZDirection atoZDirection = input.getPathDescription().getAToZDirection();
+ olmSetupBldr.setWaveNumber(atoZDirection.getAToZWavelengthNumber());
+ if (atoZDirection.getAToZMinFrequency() != null) {
+ olmSetupBldr.setLowerSpectralSlotNumber(Uint32
+ .valueOf(GridUtils
+ .getLowerSpectralIndexFromFrequency(atoZDirection.getAToZMinFrequency().getValue())));
+ }
+ if (atoZDirection.getAToZMaxFrequency() != null) {
+ olmSetupBldr.setHigherSpectralSlotNumber(Uint32
+ .valueOf(GridUtils
+ .getHigherSpectralIndexFromFrequency(atoZDirection.getAToZMaxFrequency().getValue())));
+ }
}
return olmSetupBldr.build();
}
}
public static ServicePathInputData rendererCreateServiceInputAToZ(String serviceName,
- PathDescription pathDescription) {
- NodeLists nodeLists = getNodesListAToZ(pathDescription.getAToZDirection().nonnullAToZ().values().iterator());
+ PathDescription pathDescription, Action operation) {
+ int scale = GridConstant.FIXED_GRID_FREQUENCY_PRECISION;
+ AToZDirection atoZDirection = pathDescription.getAToZDirection();
+ LOG.info("Building ServicePathInputData for a to z direction {}", atoZDirection);
+ NodeLists nodeLists = getNodesListAToZ(atoZDirection.nonnullAToZ().values().iterator());
ServicePathInputBuilder servicePathInputBuilder = new ServicePathInputBuilder()
.setServiceName(serviceName)
- .setOperation(ServicePathInput.Operation.Create)
- .setNodes(nodeLists.getList());
- if (pathDescription.getAToZDirection().getAToZWavelengthNumber() != null) {
+ .setOperation(operation)
+ .setNodes(nodeLists.getRendererNodeList())
+ .setWidth(new FrequencyGHz(GridConstant.WIDTH_40));
+ if (atoZDirection.getAToZWavelengthNumber() != null) {
servicePathInputBuilder
- .setWaveNumber(Uint32.valueOf(pathDescription.getAToZDirection().getAToZWavelengthNumber().toJava()));
+ .setWaveNumber(atoZDirection.getAToZWavelengthNumber());
+ }
+ if (Uint32.valueOf(GridConstant.IRRELEVANT_WAVELENGTH_NUMBER)
+ .equals(atoZDirection.getAToZWavelengthNumber())) {
+ scale = GridConstant.FLEX_GRID_FREQUENCY_PRECISION;
+ }
+ if (atoZDirection.getAToZMinFrequency() != null) {
+ servicePathInputBuilder.setMinFreq(new FrequencyTHz(atoZDirection.getAToZMinFrequency().getValue()));
+ servicePathInputBuilder.setLowerSpectralSlotNumber(Uint32
+ .valueOf(GridUtils
+ .getLowerSpectralIndexFromFrequency(atoZDirection.getAToZMinFrequency().getValue())));
+ }
+ if (atoZDirection.getAToZMaxFrequency() != null) {
+ servicePathInputBuilder.setMaxFreq(new FrequencyTHz(atoZDirection.getAToZMaxFrequency().getValue()));
+ servicePathInputBuilder.setHigherSpectralSlotNumber(
+ Uint32.valueOf(GridUtils
+ .getHigherSpectralIndexFromFrequency(atoZDirection.getAToZMaxFrequency().getValue())));
+ }
+ if (atoZDirection.getAToZMinFrequency() != null && atoZDirection.getAToZMaxFrequency() != null) {
+ servicePathInputBuilder.setCenterFreq(
+ GridUtils.getCentralFrequencyWithPrecision(atoZDirection.getAToZMinFrequency().getValue(),
+ atoZDirection.getAToZMaxFrequency().getValue(), scale));
+ }
+ if (atoZDirection.getRate() != null && atoZDirection.getModulationFormat() != null) {
+ Optional<ModulationFormat> optionalModulationFormat = ModulationFormat
+ .forName(atoZDirection.getModulationFormat());
+ if (optionalModulationFormat.isPresent()
+ && GridConstant.FREQUENCY_WIDTH_TABLE
+ .contains(atoZDirection.getRate(), optionalModulationFormat.get())) {
+ servicePathInputBuilder
+ .setWidth(FrequencyGHz
+ .getDefaultInstance(GridConstant.FREQUENCY_WIDTH_TABLE.get(atoZDirection.getRate(),
+ optionalModulationFormat.get())));
+ }
}
+ servicePathInputBuilder.setModulationFormat(atoZDirection.getModulationFormat())
+ .setAEndApiInfo(createAendApiInfo(pathDescription, false))
+ .setZEndApiInfo(createZendApiInfo(pathDescription, false));
return new ServicePathInputData(servicePathInputBuilder.build(), nodeLists);
}
public static ServicePathInputData rendererCreateServiceInputZToA(String serviceName,
- PathDescription pathDescription) {
+ PathDescription pathDescription, Action operation) {
+ int scale = GridConstant.FIXED_GRID_FREQUENCY_PRECISION;
+ ZToADirection ztoADirection = pathDescription.getZToADirection();
+ LOG.info("Building ServicePathInputData for z to a direction {}", ztoADirection);
NodeLists nodeLists = getNodesListZtoA(pathDescription.getZToADirection().nonnullZToA().values().iterator());
ServicePathInputBuilder servicePathInputBuilder = new ServicePathInputBuilder()
- .setOperation(ServicePathInput.Operation.Create)
+ .setOperation(operation)
.setServiceName(serviceName)
- .setNodes(nodeLists.getList());
- if (pathDescription.getAToZDirection().getAToZWavelengthNumber() != null) {
+ .setNodes(nodeLists.getRendererNodeList())
+ .setWidth(new FrequencyGHz(GridConstant.WIDTH_40));
+ if (ztoADirection.getZToAWavelengthNumber() != null) {
servicePathInputBuilder
- .setWaveNumber(Uint32.valueOf(pathDescription.getAToZDirection().getAToZWavelengthNumber().toJava()));
+ .setWaveNumber(ztoADirection.getZToAWavelengthNumber());
+ }
+ if (Uint32.valueOf(GridConstant.IRRELEVANT_WAVELENGTH_NUMBER)
+ .equals(ztoADirection.getZToAWavelengthNumber())) {
+ scale = GridConstant.FLEX_GRID_FREQUENCY_PRECISION;
+ }
+ if (ztoADirection.getZToAMinFrequency() != null) {
+ servicePathInputBuilder.setMinFreq(new FrequencyTHz(ztoADirection.getZToAMinFrequency().getValue()));
+ servicePathInputBuilder.setLowerSpectralSlotNumber(Uint32
+ .valueOf(GridUtils
+ .getLowerSpectralIndexFromFrequency(ztoADirection.getZToAMinFrequency().getValue())));
+ }
+ if (ztoADirection.getZToAMaxFrequency() != null) {
+ servicePathInputBuilder.setMaxFreq(new FrequencyTHz(ztoADirection.getZToAMaxFrequency().getValue()));
+ servicePathInputBuilder.setHigherSpectralSlotNumber(
+ Uint32.valueOf(GridUtils
+ .getHigherSpectralIndexFromFrequency(ztoADirection.getZToAMaxFrequency().getValue())));
}
+ if (ztoADirection.getZToAMinFrequency() != null && ztoADirection.getZToAMaxFrequency() != null) {
+ servicePathInputBuilder.setCenterFreq(
+ GridUtils.getCentralFrequencyWithPrecision(ztoADirection.getZToAMinFrequency().getValue(),
+ ztoADirection.getZToAMaxFrequency().getValue(), scale));
+ }
+ if (ztoADirection.getRate() != null && ztoADirection.getModulationFormat() != null) {
+ Optional<ModulationFormat> optionalModulationFormat = ModulationFormat
+ .forName(ztoADirection.getModulationFormat());
+ if (optionalModulationFormat.isPresent()
+ && GridConstant.FREQUENCY_WIDTH_TABLE
+ .contains(ztoADirection.getRate(), optionalModulationFormat.get())) {
+ servicePathInputBuilder.setWidth(FrequencyGHz
+ .getDefaultInstance(GridConstant.FREQUENCY_WIDTH_TABLE.get(ztoADirection.getRate(),
+ optionalModulationFormat.get())));
+ }
+ }
+ servicePathInputBuilder.setModulationFormat(ztoADirection.getModulationFormat())
+ .setAEndApiInfo(createAendApiInfo(pathDescription, false))
+ .setZEndApiInfo(createZendApiInfo(pathDescription, false));
return new ServicePathInputData(servicePathInputBuilder.build(), nodeLists);
}
// Adding createOtnServiceInputpath for A-Z and Z-A directions as one method
- public static OtnServicePathInput rendererCreateOtnServiceInput(String serviceName, String serviceType,
- String serviceRate, PathDescription pathDescription, boolean asideToZside) {
+ public static OtnServicePathInput rendererCreateOtnServiceInput(String serviceName, Action operation,
+ String serviceFormat, Uint32 serviceRate, PathDescription pathDescription, boolean asideToZside) {
// 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 =
+ List<org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618.otn.renderer.nodes.Nodes> nodes =
new ArrayList<>();
- NodeLists nodeLists = getNodesListAToZ(pathDescription.getAToZDirection().nonnullAToZ().values().iterator());
- if (!asideToZside) {
- nodeLists = getNodesListZtoA(pathDescription.getZToADirection().nonnullZToA().values().iterator());
- }
- LOG.info("These are node-lists {}, {}", nodeLists.getList(), nodeLists.getOlmList());
- 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())
- .setClientTp(node.getSrcTp())
- .setNetworkTp(node.getDestTp())
- .build());
+ NodeLists nodeLists =
+ (asideToZside)
+ ? getNodesListAToZ(pathDescription.getAToZDirection().nonnullAToZ().values().iterator())
+ : getNodesListZtoA(pathDescription.getZToADirection().nonnullZToA().values().iterator());
+ LOG.info("These are node-lists {}, {}", nodeLists.getRendererNodeList(), nodeLists.getOlmNodeList());
+ for (Nodes node: nodeLists.getRendererNodeList()) {
+ org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618.otn.renderer.nodes.NodesBuilder nb
+ = new org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618.otn.renderer.nodes
+ .NodesBuilder().setNodeId(node.getNodeId()).setNetworkTp(node.getDestTp());
+ if (node.getSrcTp() != null && node.getSrcTp().contains("NETWORK")) {
+ nb.setNetwork2Tp(node.getSrcTp());
+ } else {
+ nb.setClientTp(node.getSrcTp());
+ }
+ nodes.add(nb.build());
}
OtnServicePathInputBuilder otnServicePathInputBuilder = new OtnServicePathInputBuilder()
.setServiceName(serviceName)
- .setServiceType(serviceType)
+ .setOperation(operation)
+ .setServiceFormat(serviceFormat)
.setServiceRate(serviceRate)
- .setNodes(nodes);
+ .setNodes(nodes)
+ .setAEndApiInfo(createAendApiInfo(pathDescription, true))
+ .setZEndApiInfo(createZendApiInfo(pathDescription, true));
// set the trib-slots and trib-ports for the lower oder odu
- if (serviceRate.equals("1G") || (serviceRate.equals("10G"))) {
+ if (serviceRate.intValue() == 1 || (serviceRate.intValue() == 10)) {
+ Short tribPort = Short.valueOf(pathDescription.getAToZDirection().getMinTribSlot().getValue()
+ .split("\\.")[0]);
+ Short minTribSlot = Short.valueOf(pathDescription.getAToZDirection().getMinTribSlot().getValue()
+ .split("\\.")[1]);
otnServicePathInputBuilder
- .setTribPortNumber(pathDescription.getAToZDirection().getTribPortNumber().shortValue())
- .setTribSlot(pathDescription.getAToZDirection().getTribSlotNumber().shortValue());
+ .setTribPortNumber(tribPort)
+ .setTribSlot(minTribSlot);
+ }
+ if (serviceRate.intValue() == 100) {
+ List<OpucnTribSlotDef> opucnTribSlotDefList = new ArrayList<>();
+ opucnTribSlotDefList.add(pathDescription.getAToZDirection().getMinTribSlot());
+ opucnTribSlotDefList.add(pathDescription.getAToZDirection().getMaxTribSlot());
+ otnServicePathInputBuilder.setOpucnTribSlots(opucnTribSlotDefList);
}
return otnServicePathInputBuilder.build();
}
return new ServicePathInputBuilder().setServiceName(serviceName).build();
}
+ public static List<String> getLinksFromServicePathDescription(PathDescription pathDescription) {
+ List<String> linkidList = new ArrayList<>();
+ pathDescription.getAToZDirection().getAToZ().values().stream()
+ .filter(lk -> "Link".equals(lk.getResource().getResource().implementedInterface().getSimpleName()))
+ .forEach(rsc -> {
+ Link link = (Link) rsc.getResource().getResource();
+ linkidList.add(link.getLinkId());
+ });
+ pathDescription.getZToADirection().getZToA().values().stream()
+ .filter(lk -> "Link".equals(lk.getResource().getResource().implementedInterface().getSimpleName()))
+ .forEach(rsc -> {
+ Link link = (Link) rsc.getResource().getResource();
+ linkidList.add(link.getLinkId());
+ });
+ return linkidList;
+ }
+
private static NodeLists getNodesListZtoA(Iterator<ZToA> iterator) {
Map<Integer, NodeIdPair> treeMap = new TreeMap<>();
List<Nodes> olmList = new ArrayList<>();
List<Nodes> list = new ArrayList<>();
- String resourceType;
- TerminationPoint tp;
- String tpID = "";
- String nodeID = "";
- String sortId = "";
+
while (iterator.hasNext()) {
ZToA pathDesObj = iterator.next();
- resourceType = pathDesObj.getResource().getResource().implementedInterface().getSimpleName();
- LOG.info("Inside ZtoA {}", resourceType);
-
try {
- if (TERMINATION_POINT.equals(resourceType)) {
- tp = (TerminationPoint) pathDesObj.getResource().getResource();
- LOG.info(" TP is {} {}", tp.getTpId(),
- tp.getTpNodeId());
- tpID = tp.getTpId();
- 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)) {
- 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 id = Integer.parseInt(sortId);
- treeMap.put(id, new NodeIdPair(nodeID, tpID));
- } else if ("Link".equals(resourceType)) {
- LOG.info("The type is link");
- } else {
- LOG.info("The type is not identified: {}", resourceType);
- }
+ populateTreeMap(treeMap, pathDesObj.getResource().getResource(), pathDesObj.getId(), "ZtoA");
} catch (IllegalArgumentException | SecurityException e) {
- LOG.error("Dont find the getResource method", e);
+ //TODO: Auto-generated catch block
+ LOG.error("Did not find the getResource method", e);
}
}
populateNodeLists(treeMap, list, olmList, false);
Map<Integer, NodeIdPair> treeMap = new TreeMap<>();
List<Nodes> list = new ArrayList<>();
List<Nodes> olmList = new ArrayList<>();
- String resourceType;
- TerminationPoint tp;
- String tpID = "";
- String nodeID = "";
- String sortId = "";
while (iterator.hasNext()) {
AToZ pathDesObj = iterator.next();
- resourceType = pathDesObj.getResource().getResource().implementedInterface().getSimpleName();
- LOG.info("Inside AtoZ {}", resourceType);
try {
- if (TERMINATION_POINT.equals(resourceType)) {
- tp = (TerminationPoint) pathDesObj.getResource().getResource();
- LOG.info("TP is {} {}", tp.getTpId(),
- tp.getTpNodeId());
- tpID = tp.getTpId();
- 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)) {
- 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 id = Integer.parseInt(sortId);
- treeMap.put(id, new NodeIdPair(nodeID, tpID));
- } else if ("Link".equals(resourceType)) {
- LOG.info("The type is link");
- } else {
- LOG.info("The type is not identified: {}", resourceType);
- }
+ populateTreeMap(treeMap, pathDesObj.getResource().getResource(), pathDesObj.getId(), "AtoZ");
} catch (IllegalArgumentException | SecurityException e) {
//TODO: Auto-generated catch block
LOG.error("Did not find the getResource method", e);
return new NodeLists(olmList, list);
}
+ private static void populateTreeMap(Map<Integer, NodeIdPair> treeMap, Resource rsrc, String sortId,
+ String direction) {
+ String resourceType = rsrc.implementedInterface().getSimpleName();
+ LOG.info("Inside {} {}", direction, resourceType);
+ switch (resourceType) {
+ case TERMINATION_POINT:
+ TerminationPoint tp = (TerminationPoint) rsrc;
+ LOG.info(" TP is {} {}", tp.getTpId(), tp.getTpNodeId());
+ String tpID = tp.getTpId();
+
+ //TODO: do not rely on ID to be in certain format
+ if (tpID.contains("CTP") || tpID.contains("CP")) {
+ return;
+ }
+ String nodeID = "";
+ 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 {
+ return;
+ }
+ int id = Integer.parseInt(sortId);
+ treeMap.put(id, new NodeIdPair(nodeID, tpID));
+ return;
+ case LINK:
+ LOG.info("The type is link");
+ return;
+ default:
+ LOG.info("The type is not identified: {}", resourceType);
+ return;
+ }
+ }
+
@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,
- boolean isAToz) {
+ boolean isAToz) {
String desID = null;
String srcID = null;
LOG.info("treeMap values = {}", treeMap.values());
srcID = null;
desID = null;
} else {
- LOG.warn("both, the source and destination id are null!");
+ LOG.warn("both, the source and destination id are not null!");
}
}
}
+ private static AEndApiInfo createAendApiInfo(PathDescription pathDescription, boolean isForOtn) {
+ String anodeId = null;
+ String sapi = null;
+ String dapi = null;
+ if (isForOtn) {
+ anodeId = extractAendFromPathDescriptionForOtn(pathDescription).get("nodeId");
+ sapi = PortMappingUtils.fnv1size64(
+ String.join("-", anodeId, extractAendFromPathDescriptionForOtn(pathDescription).get("tpid")));
+ dapi = PortMappingUtils.fnv1size64(
+ String.join("-", extractZendFromPathDescriptionForOtn(pathDescription).get("nodeId"),
+ extractZendFromPathDescriptionForOtn(pathDescription).get("tpid")));
+ } else {
+ anodeId = extractAendFromPathDescriptionForOptical(pathDescription).get("nodeId");
+ sapi = PortMappingUtils.fnv1size64(
+ String.join("-", anodeId, extractAendFromPathDescriptionForOptical(pathDescription).get("tpid")));
+ dapi = PortMappingUtils.fnv1size64(
+ String.join("-", extractZendFromPathDescriptionForOptical(pathDescription).get("nodeId"),
+ extractZendFromPathDescriptionForOptical(pathDescription).get("tpid")));
+ }
+ return new AEndApiInfoBuilder()
+ .setSapi(sapi)
+ .setExpectedDapi(sapi)
+ .setDapi(dapi)
+ .setExpectedSapi(dapi)
+ .setNodeId(anodeId)
+ .build();
+ }
- @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(
- value = "PZLA_PREFER_ZERO_LENGTH_ARRAYS",
- justification = "not relevant to return and zero length array"
- + " as we need real pos")
- public static int[] findTheLongestSubstring(String s1, String s2) {
- if ((s1 == null) || (s2 == null)) {
- return null;
+ private static ZEndApiInfo createZendApiInfo(PathDescription pathDescription, boolean isForOtn) {
+ String znodeId = null;
+ String sapi = null;
+ String dapi = null;
+ if (isForOtn) {
+ znodeId = extractZendFromPathDescriptionForOtn(pathDescription).get("nodeId");
+ sapi = PortMappingUtils.fnv1size64(
+ String.join("-", znodeId, extractZendFromPathDescriptionForOtn(pathDescription).get("tpid")));
+ dapi = PortMappingUtils.fnv1size64(
+ String.join("-", extractAendFromPathDescriptionForOtn(pathDescription).get("nodeId"),
+ extractAendFromPathDescriptionForOtn(pathDescription).get("tpid")));
+ } else {
+ znodeId = extractZendFromPathDescriptionForOptical(pathDescription).get("nodeId");
+ sapi = PortMappingUtils.fnv1size64(
+ String.join("-", znodeId, extractZendFromPathDescriptionForOptical(pathDescription).get("tpid")));
+ dapi = PortMappingUtils.fnv1size64(
+ String.join("-", extractAendFromPathDescriptionForOptical(pathDescription).get("nodeId"),
+ extractAendFromPathDescriptionForOptical(pathDescription).get("tpid")));
}
- int[][] dp = new int[s1.length() + 1][s2.length() + 1];
- int maxLen = 0;
- int endPos = 0;
- for (int i = 1; i < dp.length; i++) {
- for (int j = 1; j < dp[0].length; j++) {
- char ch1 = s1.charAt(i - 1);
- char ch2 = s2.charAt(j - 1);
- if (ch1 == ch2) {
- dp[i][j] = dp[i - 1][j - 1] + 1;
- if (dp[i][j] >= maxLen) {
- maxLen = dp[i][j];
- endPos = i;
- }
- }
+ return new ZEndApiInfoBuilder()
+ .setSapi(sapi)
+ .setExpectedDapi(sapi)
+ .setDapi(dapi)
+ .setExpectedSapi(dapi)
+ .setNodeId(znodeId)
+ .build();
+ }
+
+ private static Map<String, String> extractAendFromPathDescriptionForOtn(PathDescription pathDescription) {
+ List<AToZ> tpList = pathDescription.getAToZDirection().getAToZ().values().stream()
+ .sorted((az1, az2) -> Integer.compare(Integer.parseInt(az1.getId()), Integer.parseInt(az2.getId())))
+ .filter(az -> TERMINATION_POINT.equals(az.getResource().getResource().implementedInterface()
+ .getSimpleName()))
+ .collect(Collectors.toList());
+ for (AToZ atoZ : tpList) {
+ TerminationPoint tp = (TerminationPoint) atoZ.getResource().getResource();
+ if (!tp.getTpId().isEmpty() && !tp.getTpNodeId().isEmpty()) {
+ String nodeId = tp.getTpNodeId();
+ String lcp = tp.getTpId();
+ return Map.of("nodeId", nodeId, "tpid", lcp);
+ }
+ }
+ return Map.of();
+ }
+
+ private static Map<String, String> extractZendFromPathDescriptionForOtn(PathDescription pathDescription) {
+ List<ZToA> tpList = pathDescription.getZToADirection().getZToA().values().stream()
+ .sorted((az1, az2) -> Integer.compare(Integer.parseInt(az1.getId()), Integer.parseInt(az2.getId())))
+ .filter(az -> TERMINATION_POINT.equals(az.getResource().getResource().implementedInterface()
+ .getSimpleName()))
+ .collect(Collectors.toList());
+ for (ZToA ztoA : tpList) {
+ TerminationPoint tp = (TerminationPoint) ztoA.getResource().getResource();
+ if (!tp.getTpId().isEmpty() && !tp.getTpNodeId().isEmpty()) {
+ String nodeId = tp.getTpNodeId();
+ String lcp = tp.getTpId();
+ return Map.of("nodeId", nodeId, "tpid", lcp);
}
}
- return new int[] { endPos - maxLen, endPos };
+ return Map.of();
}
+ private static Map<String, String> extractAendFromPathDescriptionForOptical(PathDescription pathDescription) {
+ List<AToZ> tpList = pathDescription.getAToZDirection().getAToZ().values().stream()
+ .sorted((az1, az2) -> Integer.compare(Integer.parseInt(az1.getId()), Integer.parseInt(az2.getId())))
+ .filter(az -> TERMINATION_POINT.equals(az.getResource().getResource().implementedInterface()
+ .getSimpleName()))
+ .collect(Collectors.toList());
+ for (AToZ atoZ : tpList) {
+ TerminationPoint tp = (TerminationPoint) atoZ.getResource().getResource();
+ if (!tp.getTpId().contains("CLIENT") && !tp.getTpId().isEmpty() && !tp.getTpNodeId().isEmpty()) {
+// String nodeId = tp.getTpNodeId();
+// String lcp = tp.getTpId();
+ return Map.of("nodeId", tp.getTpNodeId(), "tpid", tp.getTpId());
+ }
+ }
+ return Map.of();
+ }
+
+ private static Map<String, String> extractZendFromPathDescriptionForOptical(PathDescription pathDescription) {
+ List<ZToA> tpList = pathDescription.getZToADirection().getZToA().values().stream()
+ .sorted((az1, az2) -> Integer.compare(Integer.parseInt(az1.getId()), Integer.parseInt(az2.getId())))
+ .filter(az -> TERMINATION_POINT.equals(az.getResource().getResource().implementedInterface()
+ .getSimpleName()))
+ .collect(Collectors.toList());
+ for (ZToA ztoA : tpList) {
+ TerminationPoint tp = (TerminationPoint) ztoA.getResource().getResource();
+ if (!tp.getTpId().contains("CLIENT") && !tp.getTpId().isEmpty() && !tp.getTpNodeId().isEmpty()) {
+// String nodeId = tp.getTpNodeId();
+// String lcp = tp.getTpId();
+ return Map.of("nodeId", tp.getTpNodeId(), "tpid", tp.getTpId());
+ }
+ }
+ return Map.of();
+ }
}
Code Review / transportpce.git / blobdiff