Adapt TransportPCE code to Chlorine

[transportpce.git] / networkmodel / src / main / java / org / opendaylight / transportpce / networkmodel / service / FrequenciesServiceImpl.java

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceImpl.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceImpl.java
index 667320760ccb9d779e764d9fa67e9e6a2f66a89e..b0e24f48a9797d3a15db2d31d848441a7144e57f 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceImpl.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceImpl.java
@@ -100,17 +100,15 @@ public class FrequenciesServiceImpl implements FrequenciesService {
             List<NodeIdPair> atozTpIds = getAToZTpList(atoZDirection);
             Decimal64 atozMinFrequency = atoZDirection.getAToZMinFrequency().getValue();
             Decimal64 atozMaxFrequency = atoZDirection.getAToZMaxFrequency().getValue();
-            Optional<ModulationFormat> optionalModulationFormat = ModulationFormat
-                    .forName(atoZDirection.getModulationFormat());
-            if (!optionalModulationFormat.isPresent()) {
+            ModulationFormat modulationFormat = ModulationFormat.forName(atoZDirection.getModulationFormat());
+            if (modulationFormat == null) {
                 LOG.error("Unknown modulation format {} for a to z direction, frequencies not updated",
                         atoZDirection.getModulationFormat());
                 return;
             }
-            setFrequencies4Tps(atozMinFrequency, atozMaxFrequency, atoZDirection.getRate(),
-                    optionalModulationFormat.get(), atozTpIds, used);
-            setFrequencies4Nodes(atozMinFrequency,
-                    atozMaxFrequency,
+            setFrequencies4Tps(atozMinFrequency, atozMaxFrequency, atoZDirection.getRate(), modulationFormat, atozTpIds,
+                    used);
+            setFrequencies4Nodes(atozMinFrequency, atozMaxFrequency,
                     atozTpIds.stream().map(NodeIdPair::getNodeID).distinct().collect(Collectors.toList()),
                     used);
         }
@@ -119,15 +117,14 @@ public class FrequenciesServiceImpl implements FrequenciesService {
             List<NodeIdPair> ztoaTpIds = getZToATpList(ztoADirection);
             Decimal64 ztoaMinFrequency = ztoADirection.getZToAMinFrequency().getValue();
             Decimal64 ztoaMaxFrequency = ztoADirection.getZToAMaxFrequency().getValue();
-            Optional<ModulationFormat> optionalModulationFormat = ModulationFormat
-                    .forName(ztoADirection.getModulationFormat());
-            if (!optionalModulationFormat.isPresent()) {
+            ModulationFormat modulationFormat = ModulationFormat.forName(ztoADirection.getModulationFormat());
+            if (modulationFormat == null) {
                 LOG.error("Unknown modulation format {} for z to a direction, frequencies not updated",
                         ztoADirection.getModulationFormat());
                 return;
             }
-            setFrequencies4Tps(ztoaMinFrequency, ztoaMaxFrequency, ztoADirection.getRate(),
-                    optionalModulationFormat.get(), ztoaTpIds, used);
+            setFrequencies4Tps(ztoaMinFrequency, ztoaMaxFrequency, ztoADirection.getRate(), modulationFormat, ztoaTpIds,
+                    used);
             setFrequencies4Nodes(ztoaMinFrequency,
                     ztoaMaxFrequency,
                     ztoaTpIds.stream().map(NodeIdPair::getNodeID).distinct().collect(Collectors.toList()),