X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderer%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2Fmapping%2FPortMapping.java;h=bfdea816dbc831e58a80e6011260aa2fee960eae;hb=1585b3f3e83efb1e9467d14dc8414eb3f8c08c97;hp=4cb3c10e0d1bf2c0b46fbf7c4cb9a2c78a8ebb3e;hpb=8b7182b4c9206bcde2668e4c8c873c092eb78787;p=transportpce.git diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/mapping/PortMapping.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/mapping/PortMapping.java index 4cb3c10e0..bfdea816d 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/mapping/PortMapping.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/mapping/PortMapping.java @@ -293,18 +293,30 @@ public class PortMapping { String logicalConnectionPoint = null; if (port.getPortDirection().getIntValue() == 1) { // Port direction is transmit - logicalConnectionPoint = "SRG" + srgCounter + "-" + port - .getLogicalConnectionPoint() + "-TX"; + if (!port.getLogicalConnectionPoint().contains("SRG")) { + logicalConnectionPoint = "SRG" + srgCounter + "-" + port + .getLogicalConnectionPoint() + "-TX"; + } else { + logicalConnectionPoint = port.getLogicalConnectionPoint() + "-TX"; + } } if (port.getPortDirection().getIntValue() == 2) { // Port direction is receive - logicalConnectionPoint = "SRG" + srgCounter + "-" + port - .getLogicalConnectionPoint() + "-RX"; + if (!port.getLogicalConnectionPoint().contains("SRG")) { + logicalConnectionPoint = "SRG" + srgCounter + "-" + port + .getLogicalConnectionPoint() + "-RX"; + } else { + logicalConnectionPoint = port.getLogicalConnectionPoint() + "-RX"; + } } if (port.getPortDirection().getIntValue() == 3) { // port is bi-directional - logicalConnectionPoint = "SRG" + srgCounter + "-" + port - .getLogicalConnectionPoint() + "-TXRX"; + if (!port.getLogicalConnectionPoint().contains("SRG")) { + logicalConnectionPoint = "SRG" + srgCounter + "-" + port + .getLogicalConnectionPoint() + "-TXRX"; + } else { + logicalConnectionPoint = port.getLogicalConnectionPoint() + "-TXRX"; + } } LOG.info("Logical Connection Point for {} {} is {}", circuitPackName, port