Update PCE-GNPy for flexgrid

Remove use of wavelength to createPathConstraints in GnpyServiceImpl.
Add new method in GridUtils to get N value from frequency index.
Add new map in GridConstant to get spectral width slot number from rate.

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I7d4aa898a72300db8963edc71c5fe451e1cd0a1d

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java b/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java
index b3a96b972086d858ca5d3c536415e13dccbe4479..d9f72717157f3f4b24dfb2c55c04a5ba0e8e4bb2 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java
@@ -45,6 +45,7 @@ public final class GridConstant {
             StringConstants.SERVICE_TYPE_100GE, NB_SLOTS_100G,
             StringConstants.SERVICE_TYPE_400GE, NB_SLOTS_400G,
             StringConstants.SERVICE_TYPE_OTU4, NB_SLOTS_100G);
+
     /**
      * Map to associate service rate to modulation format.
      */
@@ -53,6 +54,7 @@ public final class GridConstant {
             ServiceRateConstant.RATE_200, ModulationFormat.DpQpsk,
             ServiceRateConstant.RATE_300, ModulationFormat.DpQam8,
             ServiceRateConstant.RATE_400, ModulationFormat.DpQam16);
+
     /**
      * Map to associate service rate and modulation format to frequency width.
      */
@@ -79,6 +81,15 @@ public final class GridConstant {
     public static final String SPECTRAL_SLOT_SEPARATOR = ":";
     public static final String NAME_PARAMETERS_SEPARATOR = "-";
 
+    /**
+     * Map for associate service rate with nb slots.
+     */
+    public static final Map<Uint32, Integer> RATE_SPECTRAL_WIDTH_SLOT_NUMBER_MAP = Map.of(
+            ServiceRateConstant.RATE_100, NB_SLOTS_100G,
+            ServiceRateConstant.RATE_200, NB_SLOTS_100G,
+            ServiceRateConstant.RATE_300, NB_SLOTS_100G,
+            ServiceRateConstant.RATE_400, NB_SLOTS_400G);
+
     private GridConstant() {
     }
 

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridUtils.java b/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridUtils.java
index 603634c19bb380c0afa059b07a459bae1ea37fb8..f70536766c6935a9e916121396774bd5158ebf02 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridUtils.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridUtils.java
@@ -212,4 +212,13 @@ public final class GridUtils {
         return spectrumInformation;
     }
 
+    /**
+     * Get the N value of range -284 +484 from frequency index array.
+     * @param frequencyIndex the frequency index f range 0 768.
+     * @return the N value
+     */
+    public static int getNFromFrequencyIndex(int frequencyIndex) {
+        return frequencyIndex - 284;
+    }
+
 }

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java
index 68411e1716017fe5e716cce9e7b68a4b556d5c1f..1c4b81172a34f6334fdb7ef110f476dec12aa155 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyServiceImpl.java
@@ -18,8 +18,11 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.transportpce.common.fixedflex.GridConstant;
+import org.opendaylight.transportpce.common.fixedflex.GridUtils;
 import org.opendaylight.transportpce.pce.constraints.PceConstraints;
 import org.opendaylight.transportpce.pce.constraints.PceConstraints.ResourcePair;
 import org.opendaylight.transportpce.pce.gnpy.utils.AToZComparator;
@@ -52,6 +55,8 @@ import org.opendaylight.yang.gen.v1.gnpy.path.rev200909.synchronization.info.Syn
 import org.opendaylight.yang.gen.v1.gnpy.path.rev200909.synchronization.info.synchronization.Svec;
 import org.opendaylight.yang.gen.v1.gnpy.path.rev200909.synchronization.info.synchronization.SvecBuilder;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestInput;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.optical.channel.types.rev200529.FrequencyTHz;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.ModulationFormat;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201126.path.description.AToZDirection;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201126.path.description.ZToADirection;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201126.path.description.atoz.direction.AToZ;
@@ -71,18 +76,6 @@ import org.slf4j.LoggerFactory;
 
 public class GnpyServiceImpl {
     private static final Logger LOG = LoggerFactory.getLogger(GnpyServiceImpl.class);
-  //Fix-grid channel width (THz)
-    private static final double FIX_CH = 0.05;
-  //Number of slot in 50GHz channel (THz)
-    private static final int NB_SLOT_BW = 4;
-  //Nominal central frequency granularity (THz)
-    private static final double SLOT_BW = 0.00625;
-  //Minimum channel center frequency (openRoadm spec) (THz)
-    private static final double MAX_CENTRAL_FREQ = 196.1;
-  //Flex-grid reference channel frequency (THz)
-    private static final double FLEX_CENTRAL_FREQ = 193.1;
-  //Convert THz to Hz
-    private static final double CONVERT_TH_HZ = 1e12;
     private static final Comparator<RouteObjectIncludeExclude> ROUTE_OBJECT_COMPARATOR =
             Comparator.comparing(RouteObjectIncludeExclude::getIndex);
 
@@ -158,11 +151,10 @@ public class GnpyServiceImpl {
         ExplicitRouteObjects explicitRouteObjects = new ExplicitRouteObjectsBuilder()
             .setRouteObjectIncludeExclude(routeObjectIncludeExcludes).build();
         //Create Path Constraint
-        Long atozWavelength = null;
-        if (atoz.getAToZWavelengthNumber() != null) {
-            atozWavelength = atoz.getAToZWavelengthNumber().toJava();
-        }
-        PathConstraints pathConstraints = createPathConstraints(atoz.getRate().toJava(), atozWavelength);
+        PathConstraints pathConstraints = createPathConstraints(atoz.getRate().toJava(),
+                atoz.getModulationFormat(),
+                atoz.getAToZMinFrequency(),
+                atoz.getAToZMaxFrequency());
 
         // Create the path request
         Map<PathRequestKey, PathRequest> pathRequestMap = new HashMap<>();
@@ -198,11 +190,10 @@ public class GnpyServiceImpl {
         ExplicitRouteObjects explicitRouteObjects = new ExplicitRouteObjectsBuilder()
             .setRouteObjectIncludeExclude(routeObjectIncludeExcludes).build();
         //Create Path Constraint
-        Long ztoaWavelength = null;
-        if (ztoa.getZToAWavelengthNumber() != null) {
-            ztoaWavelength = ztoa.getZToAWavelengthNumber().toJava();
-        }
-        PathConstraints pathConstraints = createPathConstraints(ztoa.getRate().toJava(), ztoaWavelength);
+        PathConstraints pathConstraints = createPathConstraints(ztoa.getRate().toJava(),
+                ztoa.getModulationFormat(),
+                ztoa.getZToAMinFrequency(),
+                ztoa.getZToAMaxFrequency());
 
         // Create the path request
         Map<PathRequestKey, PathRequest> pathRequestMap = new HashMap<>();
@@ -213,7 +204,7 @@ public class GnpyServiceImpl {
             .setBidirectional(false).setPathConstraints(pathConstraints)
             .setExplicitRouteObjects(explicitRouteObjects).build();
         pathRequestMap.put(pathRequestEl.key(),pathRequestEl);
-        LOG.debug("In GnpyServiceImpl: path request ZToA is extracted");
+        LOG.debug("In GnpyServiceImpl: path request ZToA is extracted is extracted");
         return pathRequestMap;
     }
 
@@ -358,19 +349,36 @@ public class GnpyServiceImpl {
     }
 
     //Create the path constraints
-    private PathConstraints createPathConstraints(Long rate, Long wavelengthNumber) {
-        // Create EffectiveFreqSlot
-        int freqNdex = 0;
-        if (wavelengthNumber != null) {
-            double freq = (MAX_CENTRAL_FREQ - FIX_CH * (wavelengthNumber - 1));
-            freqNdex = (int) Math.round((freq - FLEX_CENTRAL_FREQ) / SLOT_BW);
+    private PathConstraints createPathConstraints(Long rate, String modulationFormat, FrequencyTHz minFrequency,
+            FrequencyTHz maxFrequency) {
+        BigDecimal spacing = GridConstant.SLOT_WIDTH_50;
+        int mvalue = GridConstant.NB_SLOTS_100G;
+        int nvalue = 0;
+        if (minFrequency != null && maxFrequency != null && modulationFormat != null) {
+            LOG.info("Creating path constraints for rate {}, modulationFormat {}, min freq {}, max freq {}", rate,
+                    modulationFormat, minFrequency, maxFrequency);
+            FrequencyTHz centralFrequency = GridUtils
+                    .getCentralFrequency(minFrequency.getValue(), maxFrequency.getValue());
+            int centralFrequencyBitSetIndex = GridUtils.getIndexFromFrequency(centralFrequency.getValue());
+            mvalue = GridConstant.RATE_SPECTRAL_WIDTH_SLOT_NUMBER_MAP.getOrDefault(Uint32.valueOf(rate),
+                    GridConstant.NB_SLOTS_100G);
+            nvalue = GridUtils.getNFromFrequencyIndex(centralFrequencyBitSetIndex);
+            ModulationFormat mformat = ModulationFormat.DpQpsk;
+            Optional<ModulationFormat> optionalModulationFormat = ModulationFormat.forName(modulationFormat);
+            if (optionalModulationFormat.isPresent()) {
+                mformat = optionalModulationFormat.get();
+            }
+            spacing = GridConstant.FREQUENCY_SLOT_WIDTH_TABLE.get(Uint32.valueOf(rate), mformat);
+
         }
-        EffectiveFreqSlot effectiveFreqSlot1 = new EffectiveFreqSlotBuilder().setM(NB_SLOT_BW).setN(freqNdex).build();
-        // Create Te-Bandwidth
-        TeBandwidth teBandwidth = new TeBandwidthBuilder().setPathBandwidth(new BigDecimal(rate))
-            .setTechnology("flexi-grid").setTrxType("openroadm-beta1")
-            .setTrxMode("W100G").setEffectiveFreqSlot(Map.of(effectiveFreqSlot1.key(),effectiveFreqSlot1))
-            .setSpacing(BigDecimal.valueOf(FIX_CH * CONVERT_TH_HZ)).build();
+        LOG.info("Creating path constraints for rate {}, mvalue {}, nvalue {}, spacing {}", rate,
+                mvalue, nvalue, spacing);
+        EffectiveFreqSlot effectiveFreqSlot = new EffectiveFreqSlotBuilder().setM(mvalue / 2).setN(nvalue).build();
+        // TODO : TrxMode is today hardcoded to W100G.
+        TeBandwidth teBandwidth = new TeBandwidthBuilder().setPathBandwidth(BigDecimal.valueOf(rate))
+                .setTechnology("flexi-grid").setTrxType("openroadm-beta1").setTrxMode("W100G")
+                .setEffectiveFreqSlot(Map.of(effectiveFreqSlot.key(), effectiveFreqSlot))
+                .setSpacing(spacing.multiply(BigDecimal.valueOf(1e9))).build();
         return new PathConstraintsBuilder().setTeBandwidth(teBandwidth).build();
     }