Fix resource deletion issue in openroadm-topology 41/94641/1
authorGilles Thouenon <gilles.thouenon@orange.com>
Fri, 15 Jan 2021 10:56:02 +0000 (11:56 +0100)
committerGilles Thouenon <gilles.thouenon@orange.com>
Fri, 15 Jan 2021 10:56:02 +0000 (11:56 +0100)
JIRA: TRNSPRTPCE-383
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I99b759d9b0881f5aa1ce49864ae6f14afe361e12

networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceImpl.java

index 649b81051b9868404f9df3ccad6b00c8fb5dd558..645bd7f85b3336fdafe858b8ee139e2300e8fa6a 100644 (file)
@@ -148,7 +148,7 @@ public class FrequenciesServiceImpl implements FrequenciesService {
             if (optionalNode.isPresent()) {
                 return optionalNode.get();
             } else {
-                LOG.error("Unable to get network node for node id {}from topology {}", nodeId,
+                LOG.error("Unable to get network node for node id {} from topology {}", nodeId,
                         NetworkUtils.OVERLAY_NETWORK_ID);
                 return null;
             }
@@ -531,8 +531,11 @@ public class FrequenciesServiceImpl implements FrequenciesService {
         if (used) {
             waveLengthBuilder.setWidth(GridUtils.getWidthFromRateAndModulationFormat(rate, modulationFormat))
                     .setFrequency(GridUtils.getCentralFrequency(minFrequency, maxFrequency));
+            xpdrNetworkAttributesBuilder.setWavelength(waveLengthBuilder.build());
+        } else {
+            xpdrNetworkAttributesBuilder.setWavelength(null);
         }
-        return xpdrNetworkAttributesBuilder.setWavelength(waveLengthBuilder.build()).build();
+        return xpdrNetworkAttributesBuilder.build();
     }
 
     /**