Integrate renderer & olm code to run on device221

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

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java
index 7374530d421f3602a23ee659ef14e27d6e8d6444..b441a4ccd5eb3e3775b0d0eef8b9f9ee8e24f462 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.transportpce.common.mapping;
 import static org.opendaylight.transportpce.common.StringConstants.OPENROADM_DEVICE_VERSION_1_2_1;
-import static org.opendaylight.transportpce.common.StringConstants.OPENROADM_DEVICE_VERSION_2_2;
+import static org.opendaylight.transportpce.common.StringConstants.OPENROADM_DEVICE_VERSION_2_2_1;
 
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
@@ -35,10 +35,10 @@ public class PortMappingImpl implements PortMapping {
 
     private final DataBroker dataBroker;
     private final MappingUtils mappingUtils;
-    private final PortMappingVersion22 portMappingVersion22;
+    private final PortMappingVersion221 portMappingVersion22;
     private final PortMappingVersion121 portMappingVersion121;
 
-    public PortMappingImpl(DataBroker dataBroker,PortMappingVersion22 portMappingVersion22,MappingUtils mappingUtils,
+    public PortMappingImpl(DataBroker dataBroker, PortMappingVersion221 portMappingVersion22, MappingUtils mappingUtils,
                            PortMappingVersion121 portMappingVersion121) {
 
         this.dataBroker = dataBroker;
@@ -51,11 +51,10 @@ public class PortMappingImpl implements PortMapping {
     public boolean createMappingData(String nodeId, String nodeVersion) {
         if (nodeVersion.equals(OPENROADM_DEVICE_VERSION_1_2_1)) {
             return portMappingVersion121.createMappingData(nodeId);
-        }
-        else if (nodeVersion.equals(OPENROADM_DEVICE_VERSION_2_2)) {
+        } else if (nodeVersion.equals(OPENROADM_DEVICE_VERSION_2_2_1)) {
             return portMappingVersion22.createMappingData(nodeId);
-        }
-        else {
+        } else {
+            LOG.error("Unable to create mapping data for unmanaged openroadm device version");
             return false;
         }
     }
@@ -75,7 +74,7 @@ public class PortMappingImpl implements PortMapping {
                 .toJavaUtil();
             if (mapObject.isPresent()) {
                 Mapping mapping = mapObject.get();
-                LOG.info("Found mapping for the logical port {}. Mapping: {}", logicalConnPoint, mapping.toString());
+                LOG.info("Found mapping for {} - {}. Mapping: {}", nodeId, logicalConnPoint, mapping.toString());
                 return mapping;
             } else {
                 LOG.warn("Could not find mapping for logical connection point {} for nodeId {}", logicalConnPoint,
@@ -115,7 +114,7 @@ public class PortMappingImpl implements PortMapping {
         if (openROADMversion.equals(OPENROADM_DEVICE_VERSION_1_2_1)) {
             return portMappingVersion121.updateMapping(nodeId,oldMapping);
         }
-        else if (openROADMversion.equals(OPENROADM_DEVICE_VERSION_2_2)) {
+        else if (openROADMversion.equals(OPENROADM_DEVICE_VERSION_2_2_1)) {
             return portMappingVersion22.updateMapping(nodeId,oldMapping);
         }