From: Gilles Thouenon <gilles.thouenon@orange.com>
Date: Wed, 7 Feb 2018 14:33:15 +0000 (+0100)
Subject: Bug correction in LogicalConnectionPoint naming
X-Git-Tag: v0.2.0~62
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=1585b3f3e83efb1e9467d14dc8414eb3f8c08c97

Bug correction in LogicalConnectionPoint naming

insert if not found, the SRG number into the logical connection point
name during the portmapping creation.

Change-Id: I979dac8100a17c122cf73f2e77403a4df19a03db
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>
---

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