Fix bug in FixedFlexImpl and its use by renderer

Change-Id: Iafa5a0167352f5c43df44d5be64f862e8330778f
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/FixedFlexImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/FixedFlexImpl.java
index dd5bd03b663184447ae7c1da733e400a69c0cb8c..06c2bb9fce4af43a6bb8d86fe385446e409f34fa 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/FixedFlexImpl.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/FixedFlexImpl.java
@@ -35,6 +35,14 @@ public final class FixedFlexImpl implements FixedFlexInterface {
         this.wavelength = 0;
     }
 
+    public FixedFlexImpl(long wlIndex) {
+        this.index = wlIndex;
+        this.centerFrequency = 196.1 - (wlIndex - 1) * 0.05;
+        this.start = this.centerFrequency - 0.025;
+        this.stop = this.centerFrequency + 0.025;
+        this.wavelength = 1528.77 + ((wlIndex - 1) * 0.39);
+    }
+
     @Override
     /**
      * @param index Wavelength number

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java
index 330b6531d7821d3a5a7465fd3e2eb588f1ad301f..eef28d9e95a50049e186f45da98e546d213de758 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java
@@ -394,11 +394,9 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength
 
     private void addUsedWL(long wavelengthIndex, List<NodeIdPair> tpIds) {
         WriteTransaction addUsedWlTx = this.dataBroker.newWriteOnlyTransaction();
-        FixedFlexImpl fixedFlex = new FixedFlexImpl();
-        fixedFlex.getFixedFlexWaveMapping(wavelengthIndex);
+        FixedFlexImpl fixedFlex = new FixedFlexImpl(wavelengthIndex);
         FrequencyGHz frequencyGHz = new FrequencyGHz(new BigDecimal(fixedFlex.getWavelength()));
         FrequencyTHz frequencyTHz = new FrequencyTHz(new BigDecimal(fixedFlex.getCenterFrequency()));
-
         for (NodeIdPair idPair : tpIds) {
             Optional<TerminationPoint1> tpOpt = getTerminationPoint1FromDatastore(idPair.getNodeID(), idPair.getTpID());