From 3de1a23fe237f5d2dd8addd2d6fba7214ae0e178 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Wed, 3 Feb 2021 13:23:38 +0100 Subject: [PATCH] Add a portmapping method to create Xpdr LCP names JIRA: TRNSPRTPCE-354 Signed-off-by: guillaume.lambert Change-Id: I628ef6185f8df3166afd1cd5cbe40299119c48c7 (cherry picked from commit 2e33fdc6a6cbef1ed08bc6c1a3f9d30e4d2975b9) --- .../common/mapping/PortMappingVersion121.java | 20 +++++----- .../common/mapping/PortMappingVersion221.java | 40 +++++++++---------- .../common/mapping/PortMappingVersion710.java | 39 +++++++++--------- 3 files changed, 50 insertions(+), 49 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 f883080a5..fd964b4cc 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 @@ -230,7 +230,7 @@ public class PortMappingVersion121 { switch (port.getPortQual()) { case XpdrClient: - String lcp0 = "XPDR1-" + StringConstants.CLIENT_TOKEN + client; + String lcp0 = createXpdrLogicalConnectionPort(1, client, StringConstants.CLIENT_TOKEN); lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp0); mappingMap.put(lcp0, createXpdrMappingObject(nodeId, port, circuitPackName, lcp0, null, null, null)); @@ -240,15 +240,13 @@ public class PortMappingVersion121 { case XpdrNetwork: if (port.getPortDirection().getIntValue() == Direction.Bidirectional.getIntValue()) { - String lcp = "XPDR1-" + StringConstants.NETWORK_TOKEN + line; + String lcp = createXpdrLogicalConnectionPort(1, line, StringConstants.NETWORK_TOKEN); lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp); mappingMap.put(lcp, createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, null)); line++; continue; } - // TODO PortDirection treatment here is similar to the one in createPpPortMapping. - // Some code alignment must be considered. if (!checkPartnerPortNotNull(port)) { LOG.warn("Error in the configuration of port {} of {} for {}", @@ -284,11 +282,8 @@ public class PortMappingVersion121 { circuitPackName); continue; } - String lcp1 = "XPDR1-" + StringConstants.NETWORK_TOKEN + line; - String lcp2 = new StringBuilder("XPDR1-") - .append(StringConstants.NETWORK_TOKEN) - .append(line + 1) - .toString(); + 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; @@ -513,6 +508,13 @@ public class PortMappingVersion121 { 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 getDegreesMap(String deviceId, Info ordmInfo) { Map degrees = new HashMap<>(); 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 3af8fc344..7e58023ed 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 @@ -255,7 +255,7 @@ public class PortMappingVersion221 { switch (port.getPortQual()) { case XpdrClient: - String lcp0 = "XPDR1-" + StringConstants.CLIENT_TOKEN + client; + String lcp0 = createXpdrLogicalConnectionPort(1, client, StringConstants.CLIENT_TOKEN); lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp0); mappingMap.put(lcp0, createXpdrMappingObject(nodeId, port, circuitPackName, lcp0, null, null, null, null)); @@ -265,7 +265,7 @@ public class PortMappingVersion221 { case XpdrNetwork: if (port.getPortDirection().getIntValue() == Direction.Bidirectional.getIntValue()) { - String lcp = "XPDR1-" + StringConstants.NETWORK_TOKEN + line; + String lcp = createXpdrLogicalConnectionPort(1, line, StringConstants.NETWORK_TOKEN); lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp); mappingMap.put(lcp, createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, null, null) @@ -273,8 +273,6 @@ public class PortMappingVersion221 { line++; continue; } - // TODO PortDirection treatment here is similar to the one in createPpPortMapping. - // Some code alignment must be considered. if (!checkPartnerPortNotNull(port)) { LOG.warn("Error in the configuration of port {} of {} for {}", @@ -309,11 +307,8 @@ public class PortMappingVersion221 { circuitPackName); continue; } - String lcp1 = "XPDR1-" + StringConstants.NETWORK_TOKEN + line; - String lcp2 = new StringBuilder("XPDR1-") - .append(StringConstants.NETWORK_TOKEN) - .append(line + 1) - .toString(); + 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; @@ -381,7 +376,8 @@ public class PortMappingVersion221 { case XpdrClient: case SwitchClient: - String lcp0 = "XPDR" + xponderNb + "-" + StringConstants.CLIENT_TOKEN + client; + String lcp0 = + createXpdrLogicalConnectionPort(xponderNb, client, StringConstants.CLIENT_TOKEN); lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp0); mappingMap.put(lcp0, createXpdrMappingObject(nodeId, port, circuitPackName, lcp0, null, null, null, null)); @@ -392,7 +388,8 @@ public class PortMappingVersion221 { case XpdrNetwork: case SwitchNetwork: if (port.getPortDirection().getIntValue() == Direction.Bidirectional.getIntValue()) { - String lcp = "XPDR" + xponderNb + "-" + StringConstants.NETWORK_TOKEN + line; + String lcp = + createXpdrLogicalConnectionPort(xponderNb, line, StringConstants.NETWORK_TOKEN); lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp); mappingMap.put(lcp, createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, null, @@ -400,8 +397,6 @@ public class PortMappingVersion221 { line++; continue; } - // TODO PortDirection treatment here is similar to the one in createPpPortMapping. - // Some code alignment must be considered. if (!checkPartnerPortNotNull(port)) { LOG.warn("Error in the configuration of port {} of {} for {}", @@ -438,13 +433,10 @@ public class PortMappingVersion221 { circuitPackName); continue; } - String lcp1 = "XPDR" + xponderNb + "-" + StringConstants.NETWORK_TOKEN + line; - String lcp2 = new StringBuilder("XPDR") - .append(xponderNb) - .append("-") - .append(StringConstants.NETWORK_TOKEN) - .append(line + 1) - .toString(); + 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; @@ -710,6 +702,14 @@ public class PortMappingVersion221 { 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 getDegreesMap(String deviceId, Info ordmInfo) { Map degrees = new HashMap<>(); 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 6f3be2916..3bf2b46f7 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 @@ -254,7 +254,7 @@ public class PortMappingVersion710 { switch (port.getPortQual()) { case XpdrClient: - String lcp0 = "XPDR1-" + StringConstants.CLIENT_TOKEN + client; + String lcp0 = createXpdrLogicalConnectionPort(1, client, StringConstants.CLIENT_TOKEN); lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp0); mappingMap.put(lcp0, createXpdrMappingObject(nodeId, port, circuitPackName, lcp0, null, null, null, null)); @@ -264,7 +264,7 @@ public class PortMappingVersion710 { case XpdrNetwork: if (port.getPortDirection().getIntValue() == Direction.Bidirectional.getIntValue()) { - String lcp = "XPDR1-" + StringConstants.NETWORK_TOKEN + line; + String lcp = createXpdrLogicalConnectionPort(1, line, StringConstants.NETWORK_TOKEN); lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp); mappingMap.put(lcp, createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, null, null) @@ -272,8 +272,6 @@ public class PortMappingVersion710 { line++; continue; } - // TODO PortDirection treatment here is similar to the one in createPpPortMapping. - // Some code alignment must be considered. if (!checkPartnerPortNotNull(port)) { LOG.warn("Error in the configuration of port {} of {} for {}", @@ -308,11 +306,8 @@ public class PortMappingVersion710 { circuitPackName); continue; } - String lcp1 = "XPDR1-" + StringConstants.NETWORK_TOKEN + line; - String lcp2 = new StringBuilder("XPDR1-") - .append(StringConstants.NETWORK_TOKEN) - .append(line + 1) - .toString(); + 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; @@ -380,7 +375,8 @@ public class PortMappingVersion710 { case XpdrClient: case SwitchClient: - String lcp0 = "XPDR" + xponderNb + "-" + StringConstants.CLIENT_TOKEN + client; + String lcp0 = + createXpdrLogicalConnectionPort(xponderNb , client, StringConstants.CLIENT_TOKEN); lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp0); mappingMap.put(lcp0, createXpdrMappingObject(nodeId, port, circuitPackName, lcp0, null, null, null, null)); @@ -391,7 +387,8 @@ public class PortMappingVersion710 { case XpdrNetwork: case SwitchNetwork: if (port.getPortDirection().getIntValue() == Direction.Bidirectional.getIntValue()) { - String lcp = "XPDR" + xponderNb + "-" + StringConstants.NETWORK_TOKEN + line; + String lcp = + createXpdrLogicalConnectionPort(xponderNb , line, StringConstants.NETWORK_TOKEN); lcpMap.put(circuitPackName + '+' + port.getPortName(), lcp); mappingMap.put(lcp, createXpdrMappingObject(nodeId, port, circuitPackName, lcp, null, null, null, @@ -399,8 +396,6 @@ public class PortMappingVersion710 { line++; continue; } - // TODO PortDirection treatment here is similar to the one in createPpPortMapping. - // Some code alignment must be considered. if (!checkPartnerPortNotNull(port)) { LOG.warn("Error in the configuration of port {} of {} for {}", @@ -437,13 +432,10 @@ public class PortMappingVersion710 { circuitPackName); continue; } - String lcp1 = "XPDR" + xponderNb + "-" + StringConstants.NETWORK_TOKEN + line; - String lcp2 = new StringBuilder("XPDR") - .append(xponderNb) - .append("-") - .append(StringConstants.NETWORK_TOKEN) - .append(line + 1) - .toString(); + 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; @@ -710,6 +702,13 @@ public class PortMappingVersion710 { 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 getMcCapabilityProfiles(String deviceId, Info ordmInfo) { Map mcCapabilityProfiles = new HashMap<>(); InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class); -- 2.36.6