From 350dc88e662ec6c9abe2431fd02b9746abc9fee6 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Tue, 13 Feb 2024 13:44:48 +0100 Subject: [PATCH] Fix ConvertORToTapiTopology Upper/Lower Freq bug JIRA: TRNSPRTPCE Signed-off-by: guillaume.lambert Change-Id: I91568bef19ddb5475c74696720517fed8c905f11 --- .../tapi/topology/ConvertORToTapiTopology.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORToTapiTopology.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORToTapiTopology.java index 3aaeeef7f..7510eca71 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORToTapiTopology.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORToTapiTopology.java @@ -616,9 +616,9 @@ public class ConvertORToTapiTopology { false, sicColl,operModeList)); double naz = 0.01; AvailableSpectrum aspec = new AvailableSpectrumBuilder() - .setUpperFrequency(Uint64.valueOf(Math.round(GridConstant.START_EDGE_FREQUENCY * 1E09 + naz))) - .setLowerFrequency(Uint64.valueOf(Math.round(GridConstant.START_EDGE_FREQUENCY * 1E09 + .setUpperFrequency(Uint64.valueOf(Math.round(GridConstant.START_EDGE_FREQUENCY * 1E09 + GridConstant.GRANULARITY * GridConstant.EFFECTIVE_BITS * 1E06 + naz))) + .setLowerFrequency(Uint64.valueOf(Math.round(GridConstant.START_EDGE_FREQUENCY * 1E09 + naz))) .build(); Map aspecMap = new HashMap<>(); aspecMap.put(new AvailableSpectrumKey(aspec.getLowerFrequency(), @@ -642,9 +642,9 @@ public class ConvertORToTapiTopology { spectrumPac.setOccupiedSpectrum(ospecMap); double nazz = 0.01; SupportableSpectrum sspec = new SupportableSpectrumBuilder() - .setUpperFrequency(Uint64.valueOf(Math.round(GridConstant.START_EDGE_FREQUENCY * 1E09 + nazz))) - .setLowerFrequency(Uint64.valueOf(Math.round(GridConstant.START_EDGE_FREQUENCY * 1E09 + .setUpperFrequency(Uint64.valueOf(Math.round(GridConstant.START_EDGE_FREQUENCY * 1E09 + GridConstant.GRANULARITY * GridConstant.EFFECTIVE_BITS * 1E06 + nazz))) + .setLowerFrequency(Uint64.valueOf(Math.round(GridConstant.START_EDGE_FREQUENCY * 1E09 + nazz))) .build(); Map sspecMap = new HashMap<>(); sspecMap.put(new SupportableSpectrumKey(sspec.getLowerFrequency(), -- 2.36.6