upgrade openroadm models to 2.2.1

[transportpce.git] / common / src / main / java / org / opendaylight / transportpce / common / crossconnect / CrossConnectImpl.java

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java
index a52805b82ff8c5eecf1928357df7ce1b208795f7..4ef18756b45825f7afa31e384b72f0ea46ad1589 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl.java
@@ -9,7 +9,7 @@
 package org.opendaylight.transportpce.common.crossconnect;
 
 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.math.BigDecimal;
 import java.util.List;
@@ -29,15 +29,15 @@ public class CrossConnectImpl implements CrossConnect {
     protected CrossConnect crossConnect;
     private final MappingUtils mappingUtils;
     private CrossConnectImpl121 crossConnectImpl121;
-    private CrossConnectImpl22 crossConnectImpl22;
+    private CrossConnectImpl221 crossConnectImpl221;
 
     public CrossConnectImpl(DeviceTransactionManager deviceTransactionManager, MappingUtils mappingUtils,
                             CrossConnectImpl121 crossConnectImpl121,
-                            CrossConnectImpl22 crossConnectImpl22) {
+                            CrossConnectImpl221 crossConnectImpl221) {
         this.deviceTransactionManager = deviceTransactionManager;
         this.mappingUtils = mappingUtils;
         this.crossConnectImpl121 = crossConnectImpl121;
-        this.crossConnectImpl22 = crossConnectImpl22;
+        this.crossConnectImpl221 = crossConnectImpl221;
         this.crossConnect = null;
     }
 
@@ -46,8 +46,8 @@ public class CrossConnectImpl implements CrossConnect {
         if (openRoadmVersion.equals(OPENROADM_DEVICE_VERSION_1_2_1)) {
             return crossConnectImpl121.getCrossConnect(nodeId,connectionNumber);
         }
-        else if (openRoadmVersion.equals(OPENROADM_DEVICE_VERSION_2_2)) {
-            return crossConnectImpl22.getCrossConnect(nodeId,connectionNumber);
+        else if (openRoadmVersion.equals(OPENROADM_DEVICE_VERSION_2_2_1)) {
+            return crossConnectImpl221.getCrossConnect(nodeId,connectionNumber);
         }
         return null;
     }
@@ -60,9 +60,9 @@ public class CrossConnectImpl implements CrossConnect {
             LOG.info("Device Version is 1.2.1");
             return crossConnectImpl121.postCrossConnect(nodeId, waveNumber, srcTp, destTp);
         }
-        else if (openRoadmVersion.equals(OPENROADM_DEVICE_VERSION_2_2)) {
+        else if (openRoadmVersion.equals(OPENROADM_DEVICE_VERSION_2_2_1)) {
             LOG.info("Device Version is 2.2");
-            return crossConnectImpl22.postCrossConnect(nodeId, waveNumber, srcTp, destTp);
+            return crossConnectImpl221.postCrossConnect(nodeId, waveNumber, srcTp, destTp);
         }
         LOG.info("Device Version not found");
         return null;
@@ -76,8 +76,8 @@ public class CrossConnectImpl implements CrossConnect {
         if (openRoadmVersion.equals(OPENROADM_DEVICE_VERSION_1_2_1)) {
             return crossConnectImpl121.deleteCrossConnect(nodeId, connectionNumber);
         }
-        else if (openRoadmVersion.equals(OPENROADM_DEVICE_VERSION_2_2)) {
-            return crossConnectImpl22.deleteCrossConnect(nodeId, connectionNumber);
+        else if (openRoadmVersion.equals(OPENROADM_DEVICE_VERSION_2_2_1)) {
+            return crossConnectImpl221.deleteCrossConnect(nodeId, connectionNumber);
         }
         return false;
     }
@@ -88,8 +88,8 @@ public class CrossConnectImpl implements CrossConnect {
         if (openRoadmVersion.equals(OPENROADM_DEVICE_VERSION_1_2_1)) {
             return crossConnectImpl121.getConnectionPortTrail(nodeId, waveNumber, srcTp, destTp);
         }
-        else if (openRoadmVersion.equals(OPENROADM_DEVICE_VERSION_2_2)) {
-            return crossConnectImpl22.getConnectionPortTrail(nodeId, waveNumber, srcTp, destTp);
+        else if (openRoadmVersion.equals(OPENROADM_DEVICE_VERSION_2_2_1)) {
+            return crossConnectImpl221.getConnectionPortTrail(nodeId, waveNumber, srcTp, destTp);
         }
         return null;
     }
@@ -100,8 +100,8 @@ public class CrossConnectImpl implements CrossConnect {
         if (openRoadmVersion.equals(OPENROADM_DEVICE_VERSION_1_2_1)) {
             return crossConnectImpl121.setPowerLevel(nodeId,mode,powerValue,connectionNumber);
         }
-        else if (openRoadmVersion.equals(OPENROADM_DEVICE_VERSION_2_2)) {
-            return crossConnectImpl22.setPowerLevel(nodeId,mode,powerValue,connectionNumber);
+        else if (openRoadmVersion.equals(OPENROADM_DEVICE_VERSION_2_2_1)) {
+            return crossConnectImpl221.setPowerLevel(nodeId,mode,powerValue,connectionNumber);
         }
         return false;
     }