BUG-2382: OutputActionBuilder.setOutputNodeConnector

[openflowplugin.git] / legacy / sal-compatibility / src / main / java / org / opendaylight / openflowplugin / legacy / sal / compatibility / NodeMapping.java

diff --git a/legacy/sal-compatibility/src/main/java/org/opendaylight/openflowplugin/legacy/sal/compatibility/NodeMapping.java b/legacy/sal-compatibility/src/main/java/org/opendaylight/openflowplugin/legacy/sal/compatibility/NodeMapping.java
index 6002427e121e025a4032eda8eb3b33e5604c9126..b58d46a0b993dc01f11addc37fb503219c49c117 100644 (file)
--- a/legacy/sal-compatibility/src/main/java/org/opendaylight/openflowplugin/legacy/sal/compatibility/NodeMapping.java
+++ b/legacy/sal-compatibility/src/main/java/org/opendaylight/openflowplugin/legacy/sal/compatibility/NodeMapping.java
@@ -10,6 +10,7 @@ package org.opendaylight.openflowplugin.legacy.sal.compatibility;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
+
 import org.opendaylight.controller.sal.common.util.Arguments;
 import org.opendaylight.controller.sal.core.AdvertisedBandwidth;
 import org.opendaylight.controller.sal.core.Bandwidth;
@@ -205,7 +206,7 @@ public final class NodeMapping {
             return org.opendaylight.controller.sal.core.NodeConnector.SPECIALNODECONNECTORID;
         }
 
-        String nodeConnectorIdStripped = ALL_CHARS_TO_COLON.matcher(nodeConnectorId.getValue()).replaceFirst("");
+        String nodeConnectorIdStripped = stripToColon(nodeConnectorId.getValue());
 
         if (NUMBERS_ONLY.matcher(nodeConnectorIdStripped).matches()) {
             Short nodeConnectorIdVal = null;
@@ -219,6 +220,10 @@ public final class NodeMapping {
         return nodeConnectorIdStripped;
     }
 
+    public static String stripToColon(final String elementId) {
+        return ALL_CHARS_TO_COLON.matcher(elementId).replaceFirst("");
+    }
+
     public static NodeId toAdNodeId(final NodeConnectorId nodeConnectorId) {
         NodeId nodeId = null;
         if (nodeConnectorId != null) {