Adapt TransportPCE code to Chlorine

[transportpce.git] / tapi / src / main / java / org / opendaylight / transportpce / tapi / connectivity / ConnectivityUtils.java

diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/connectivity/ConnectivityUtils.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/connectivity/ConnectivityUtils.java
index c88c5239c689c25cc09c859a790aaeac49fdfbcd..cbfbbf4b10aea67a04684df0bc175fcecb9487cc 100644 (file)
--- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/connectivity/ConnectivityUtils.java
+++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/connectivity/ConnectivityUtils.java
@@ -347,7 +347,7 @@ public final class ConnectivityUtils {
             = this.tapiContext.getTapiNode(this.tapiTopoUuid, nodeUuid);
         if (tapiNode != null) {
             return OpenroadmNodeType.forName(tapiNode.getName().get(new NameKey("Node Type"))
-                .getValue()).get();
+                .getValue());
         }
         return null;
     }
@@ -1540,10 +1540,10 @@ public final class ConnectivityUtils {
                 .setIndex(Uint8.ZERO)
                 .build()));
         if (serviceFormat.equals(ServiceFormat.ODU)) {
-            serviceZEndBuilder.setOduServiceRate(ODU4.class);
+            serviceZEndBuilder.setOduServiceRate(ODU4.VALUE);
         }
         if (serviceFormat.equals(ServiceFormat.OTU)) {
-            serviceZEndBuilder.setOtuServiceRate(OTU4.class);
+            serviceZEndBuilder.setOtuServiceRate(OTU4.VALUE);
         }
         if (!serviceLayer.equals(LayerProtocolName.ETH)) {
             serviceZEndBuilder
@@ -1647,10 +1647,10 @@ public final class ConnectivityUtils {
                 .setIndex(Uint8.ZERO)
                 .build()));
         if (serviceFormat.equals(ServiceFormat.ODU)) {
-            serviceAEndBuilder.setOduServiceRate(ODU4.class);
+            serviceAEndBuilder.setOduServiceRate(ODU4.VALUE);
         }
         if (serviceFormat.equals(ServiceFormat.OTU)) {
-            serviceAEndBuilder.setOtuServiceRate(OTU4.class);
+            serviceAEndBuilder.setOtuServiceRate(OTU4.VALUE);
         }
         if (!serviceLayer.equals(LayerProtocolName.ETH)) {
             serviceAEndBuilder
@@ -1757,7 +1757,7 @@ public final class ConnectivityUtils {
                     return null;
                 }
                 OpenroadmNodeType openroadmNodeType = OpenroadmNodeType.forName(optNode.get().getName().get(
-                    new NameKey("Node Type")).getValue()).get();
+                    new NameKey("Node Type")).getValue());
                 if (!openroadmNodeTypeList.contains(openroadmNodeType)) {
                     openroadmNodeTypeList.add(openroadmNodeType);
                 }