From 9338fc4be627ccfdab73602604a78812b748d88d Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Thu, 28 Jan 2021 14:53:54 +0100 Subject: [PATCH] Add a portmapping putXpdrLcpsInMaps method JIRA: TRNSPRTPCE-354 Signed-off-by: guillaume.lambert Change-Id: I8295bb6352d2fb476a88af9490ea067f11048a75 --- .../common/mapping/PortMappingVersion121.java | 36 +++++++----- .../common/mapping/PortMappingVersion221.java | 58 +++++++++---------- .../common/mapping/PortMappingVersion710.java | 58 +++++++++---------- 3 files changed, 75 insertions(+), 77 deletions(-) diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java index fd964b4cc..20d46a281 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java @@ -282,19 +282,9 @@ public class PortMappingVersion121 { circuitPackName); continue; } - String lcp1 = createXpdrLogicalConnectionPort(1, line, StringConstants.NETWORK_TOKEN); - String lcp2 = createXpdrLogicalConnectionPort(1, line + 1, StringConstants.NETWORK_TOKEN); - if (lcpMap.containsKey(lcp1) || lcpMap.containsKey(lcp2)) { - LOG.warn("mapping already exists for {} or {}", lcp1, lcp2); - line += 2; - continue; - } - lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1); - lcpMap.put(cpOpt.get().getCircuitPackName() + '+' + port2.getPortName(), lcp2); - mappingMap.put(lcp1, createXpdrMappingObject(nodeId, port, circuitPackName, lcp1, - lcp2, null, null)); - mappingMap.put(lcp2, createXpdrMappingObject(nodeId, port2, - cpOpt.get().getCircuitPackName(), lcp2, lcp1, null, null)); + putXpdrLcpsInMaps(line, nodeId, 1, + circuitPackName, cpOpt.get().getCircuitPackName(), port, port2, + lcpMap, mappingMap); line += 2; break; @@ -717,6 +707,26 @@ public class PortMappingVersion121 { return mpBldr.build(); } + private void putXpdrLcpsInMaps(int line, String nodeId, + Integer xponderNb, + String circuitPackName, String circuitPackName2, Ports port, Ports port2, + Map lcpMap, Map 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 {}", lcp1, lcp2); + return; + } + lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1); + lcpMap.put(circuitPackName2 + '+' + port2.getPortName(), lcp2); + mappingMap.put(lcp1, + createXpdrMappingObject(nodeId, port, circuitPackName, lcp1, lcp2, null, null)); + mappingMap.put(lcp2, + createXpdrMappingObject(nodeId, port2, circuitPackName2, lcp2, lcp1, null, null)); + return; + } + + private boolean createTtpPortMapping(String nodeId, Info deviceInfo, List portMapList) { // Creating mapping data for degree TTP's Map degrees = getDegreesMap(nodeId, deviceInfo); diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java index 7e58023ed..ace72bda9 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java @@ -307,21 +307,9 @@ public class PortMappingVersion221 { circuitPackName); continue; } - String lcp1 = createXpdrLogicalConnectionPort(1, line, StringConstants.NETWORK_TOKEN); - String lcp2 = createXpdrLogicalConnectionPort(1, line + 1, StringConstants.NETWORK_TOKEN); - if (lcpMap.containsKey(lcp1) || lcpMap.containsKey(lcp2)) { - LOG.warn("mapping already exists for {} or {}", lcp1, lcp2); - line += 2; - continue; - } - lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1); - lcpMap.put(cpOpt.get().getCircuitPackName() + '+' + port2.getPortName(), lcp2); - mappingMap.put(lcp1, - createXpdrMappingObject(nodeId, port, circuitPackName, - lcp1, lcp2, null, null, null)); - mappingMap.put(lcp2, - createXpdrMappingObject(nodeId, port2, cpOpt.get().getCircuitPackName(), - lcp2, lcp1, null, null, null)); + putXpdrLcpsInMaps(line, nodeId, 1, null, + circuitPackName, cpOpt.get().getCircuitPackName(), port, port2, + lcpMap, mappingMap); line += 2; break; @@ -433,23 +421,9 @@ public class PortMappingVersion221 { circuitPackName); continue; } - 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 {}", lcp1, lcp2); - line += 2; - continue; - } - lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1); - lcpMap.put(cpOpt.get().getCircuitPackName() + '+' + port2.getPortName(), lcp2); - mappingMap.put(lcp1, - createXpdrMappingObject(nodeId, port, circuitPackName, - lcp1, lcp2, null, null, xponderType)); - mappingMap.put(lcp2, - createXpdrMappingObject(nodeId, port2, cpOpt.get().getCircuitPackName(), - lcp2, lcp1, null, null, xponderType)); + putXpdrLcpsInMaps(line, nodeId, xponderNb, xponderType, + circuitPackName, cpOpt.get().getCircuitPackName(), port, port2, + lcpMap, mappingMap); line += 2; break; @@ -1019,6 +993,26 @@ public class PortMappingVersion221 { return mpBldr.build(); } + private void putXpdrLcpsInMaps(int line, String nodeId, + Integer xponderNb, XpdrNodeTypes xponderType, + String circuitPackName, String circuitPackName2, Ports port, Ports port2, + Map lcpMap, Map 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 {}", lcp1, lcp2); + return; + } + lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1); + lcpMap.put(circuitPackName2 + '+' + port2.getPortName(), lcp2); + mappingMap.put(lcp1, + createXpdrMappingObject(nodeId, port, circuitPackName, lcp1, lcp2, null, null, xponderType)); + mappingMap.put(lcp2, + createXpdrMappingObject(nodeId, port2, circuitPackName2, lcp2, lcp1, null, null, xponderType)); + return; + } + + private boolean createMcCapabilitiesList(String nodeId, Info deviceInfo, List mcCapabilitiesList) { Map degrees = getDegreesMap(nodeId, deviceInfo); List srgs = getSrgs(nodeId, deviceInfo); diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java index 3bf2b46f7..d3e75ae2f 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java @@ -306,21 +306,9 @@ public class PortMappingVersion710 { circuitPackName); continue; } - String lcp1 = createXpdrLogicalConnectionPort(1, line, StringConstants.NETWORK_TOKEN); - String lcp2 = createXpdrLogicalConnectionPort(1, line + 1, StringConstants.NETWORK_TOKEN); - if (lcpMap.containsKey(lcp1) || lcpMap.containsKey(lcp2)) { - LOG.warn("mapping already exists for {} or {}", lcp1, lcp2); - line += 2; - continue; - } - lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1); - lcpMap.put(cpOpt.get().getCircuitPackName() + '+' + port2.getPortName(), lcp2); - mappingMap.put(lcp1, - createXpdrMappingObject(nodeId, port, circuitPackName, - lcp1, lcp2, null, null, null)); - mappingMap.put(lcp2, - createXpdrMappingObject(nodeId, port2, cpOpt.get().getCircuitPackName(), - lcp2, lcp1, null, null, null)); + putXpdrLcpsInMaps(line, nodeId, 1, null, + circuitPackName, cpOpt.get().getCircuitPackName(), port, port2, + lcpMap, mappingMap); line += 2; break; @@ -432,23 +420,9 @@ public class PortMappingVersion710 { circuitPackName); continue; } - 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 {}", lcp1, lcp2); - line += 2; - continue; - } - lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1); - lcpMap.put(cpOpt.get().getCircuitPackName() + '+' + port2.getPortName(), lcp2); - mappingMap.put(lcp1, - createXpdrMappingObject(nodeId, port, circuitPackName, - lcp1, lcp2, null, null, xponderType)); - mappingMap.put(lcp2, - createXpdrMappingObject(nodeId, port2, cpOpt.get().getCircuitPackName(), - lcp2, lcp1, null, null, xponderType)); + putXpdrLcpsInMaps(line, nodeId, xponderNb, xponderType, + circuitPackName, cpOpt.get().getCircuitPackName(), port, port2, + lcpMap, mappingMap); line += 2; break; @@ -1059,6 +1033,26 @@ public class PortMappingVersion710 { return mpBldr.build(); } + private void putXpdrLcpsInMaps(int line, String nodeId, + Integer xponderNb, XpdrNodeTypes xponderType, + String circuitPackName, String circuitPackName2, Ports port, Ports port2, + Map lcpMap, Map 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 {}", lcp1, lcp2); + return; + } + lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp1); + lcpMap.put(circuitPackName2 + '+' + port2.getPortName(), lcp2); + mappingMap.put(lcp1, + createXpdrMappingObject(nodeId, port, circuitPackName, lcp1, lcp2, null, null, xponderType)); + mappingMap.put(lcp2, + createXpdrMappingObject(nodeId, port2, circuitPackName2, lcp2, lcp1, null, null, xponderType)); + return; + } + + private boolean createMcCapabilitiesList(String nodeId, Info deviceInfo, List mcCapabilitiesList) { Map degrees = getDegreesMap(nodeId, deviceInfo); List srgs = getSrgs(nodeId, deviceInfo); -- 2.36.6