Merge "PortMapping for device 1.2.1 and 2.2"

[transportpce.git] / common / src / main / java / org / opendaylight / transportpce / common / mapping / MappingUtilsImpl.java

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java
index b87971a1faddde0ce28928f1b957c01275feebdd..ca3e029782732e291c70cf7cbc59df9b13669cec 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java
@@ -49,11 +49,10 @@ public class MappingUtilsImpl implements MappingUtils {
                     case _121:
                         return StringConstants.OPENROADM_DEVICE_VERSION_1_2_1;
                     default:
-                        return StringConstants.OPENROADM_DEVICE_VERSION_1_2_1;
+                        LOG.warn("unknown openROADM device version");
                 }
             } else {
                 LOG.warn("Could not find mapping for nodeId {}", nodeId);
-                return StringConstants.OPENROADM_DEVICE_VERSION_1_2_1;
             }
         } catch (InterruptedException | ExecutionException ex) {
             LOG.error("Unable to read mapping for nodeId {}",nodeId, ex);