commit 2f72af40723d32cd121fa6fe4863f5a24ede8b9d
author alessio <alessio.giorgetti@gmail.com> Fri Dec 13 10:29:22 2019 +0100
committer Andrea Campanella <andrea@opennetworking.org> Fri Dec 13 15:49:03 2019 +0000
tree 459b4aa409f1b84c02acd29181350dffe924480b
parent 0ecf129a1d7580d95fc3e0ea5773b65d8e74db6d

Alignment of the generated flow rule format to the format used by the intent framework for OpticalConnectivityIntent.

Patch 2: checkstyle.

Change-Id: I133459274d37df5c74f8599d382a3370b26ae640

apps/roadm/app/src/main/java/org/onosproject/roadm/RoadmManager.java

diff --git a/apps/roadm/app/src/main/java/org/onosproject/roadm/RoadmManager.java b/apps/roadm/app/src/main/java/org/onosproject/roadm/RoadmManager.java
index 9a3f30a..2cbc711 100644
--- a/apps/roadm/app/src/main/java/org/onosproject/roadm/RoadmManager.java
+++ b/apps/roadm/app/src/main/java/org/onosproject/roadm/RoadmManager.java
@@ -28,6 +28,7 @@
 import org.onosproject.net.ModulationScheme;
 import org.onosproject.net.OchSignal;
 import org.onosproject.net.Port;
+import org.onosproject.net.OchSignalType;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.behaviour.LambdaQuery;
 import org.onosproject.net.behaviour.ModulationConfig;
@@ -345,9 +346,14 @@
         checkNotNull(inPort);
         checkNotNull(outPort);
 
+        //Creation of selector.
         TrafficSelector selector = DefaultTrafficSelector.builder()
                 .add(Criteria.matchInPort(inPort))
+                .add(Criteria.matchOchSignalType(OchSignalType.FIXED_GRID))
+                .add(Criteria.matchLambda(ochSignal))
                 .build();
+
+        //Creation of treatment
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
                 .add(Instructions.modL0Lambda(ochSignal))
                 .add(Instructions.createOutput(outPort))