From 49f4eb89ea75f9ba6d8b7761ff2c70ac3125eae6 Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Thu, 6 Jun 2019 12:36:53 +0200 Subject: [PATCH] Fix bug in FixedFlexImpl and its use by renderer Change-Id: Iafa5a0167352f5c43df44d5be64f862e8330778f Signed-off-by: Gilles Thouenon --- .../transportpce/common/fixedflex/FixedFlexImpl.java | 8 ++++++++ .../renderer/NetworkModelWavelengthServiceImpl.java | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) 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 dd5bd03b6..06c2bb9fc 100644 --- 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 330b6531d..eef28d9e9 100644 --- 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 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 tpOpt = getTerminationPoint1FromDatastore(idPair.getNodeID(), idPair.getTpID()); -- 2.36.6