Bump to Magnesium dependencies

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

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java
index dd0cd820467dae54e674ee9d269bf79fc2d2ab10..7f06049523dceedb9fdba946fe310572495608b1 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion221.java
@@ -295,7 +295,7 @@ public class PortMappingVersion221 {
             for (Xponder xponder:deviceObject.get().getXponder()) {
                 line = 1;
                 client = 1;
-                Integer xponderNb = xponder.getXpdrNumber();
+                Integer xponderNb = xponder.getXpdrNumber().toJava();
                 XpdrNodeTypes xponderType = xponder.getXpdrType();
                 for (XpdrPort xpdrPort : xponder.getXpdrPort()) {
                     String circuitPackName = xpdrPort.getCircuitPackName();
@@ -474,7 +474,7 @@ public class PortMappingVersion221 {
         // Get value for max Srg from info subtree, required for iteration
         // if not present assume to be 20 (temporary)
         if (ordmInfo.getMaxSrgs() != null) {
-            maxSrg = ordmInfo.getMaxSrgs();
+            maxSrg = ordmInfo.getMaxSrgs().toJava();
         } else {
             maxSrg = 20;
         }
@@ -489,7 +489,7 @@ public class PortMappingVersion221 {
                 Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
             if (ordmSrgObject.isPresent()) {
                 srgCps.addAll(ordmSrgObject.get().getCircuitPacks());
-                cpPerSrg.put(ordmSrgObject.get().getSrgNumber(), srgCps);
+                cpPerSrg.put(ordmSrgObject.get().getSrgNumber().toJava(), srgCps);
             }
         }
         LOG.info("Device {} has {} Srg", deviceId, cpPerSrg.size());
@@ -610,7 +610,7 @@ public class PortMappingVersion221 {
         // Get value for max degree from info subtree, required for iteration
         // if not present assume to be 20 (temporary)
         if (ordmInfo.getMaxDegrees() != null) {
-            maxDegree = ordmInfo.getMaxDegrees();
+            maxDegree = ordmInfo.getMaxDegrees().toJava();
         } else {
             maxDegree = 20;
         }
@@ -635,7 +635,7 @@ public class PortMappingVersion221 {
         Integer maxDegree;
 
         if (ordmInfo.getMaxDegrees() != null) {
-            maxDegree = ordmInfo.getMaxDegrees();
+            maxDegree = ordmInfo.getMaxDegrees().toJava();
         } else {
             maxDegree = 20;
         }