commit 320e6c97f8f8d7076c70c2cb6555ebb68b7d2dbd
author Pavlin Radoslavov <pavlin@onlab.us> Mon Feb 02 16:51:58 2015 -0800
committer Pavlin Radoslavov <pavlin@onlab.us> Tue Feb 03 14:40:08 2015 +0000
tree d84ad9c1ac69f67d85bb7a01a755cb88b1936a82
parent 45c9fe54028d5487bd2abd530e71e149fbc46304

Implement some of the missing Selector and Match Conditions

Work toward ONOS-509

The following match conditions are added/implemented:
 - UDP_SRC, UDP_DST
 - SCTP_SRC, SCTP_DST
 - ICMPV4_TYPE, ICMPV4_CODE
 - IPV6_FLABEL
 - IPV6_ND_TARGET
 - IPV6_ND_SLL
 - IPV6_ND_TLL

Also:
 * Renamed method
     TrafficSelector.Builder.matchInport(PortNumber port)
   to
     TrafficSelector.Builder.matchInPort(PortNumber port)
   (for consistency with the corresponding method(s) elsewhere)
 * Reordered the code for some of the existing matching conditions
   to follow the order in the OpenFlow spec, so it is easier to
   cross-reference such code.
 * Added missing Javadoc
 * Added few more Criterion.Type values as per OpenFlow spec 1.5.0

Change-Id: I7fc1656f32d8a7280c67d7827e4aa84528b0eafc

apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java

diff --git a/apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java b/apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java
index f88ad5e..2f29d7e 100644
--- a/apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java
+++ b/apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java
@@ -107,21 +107,21 @@
         case 1:
             inport = 10;
             outport = 20;
-            sbuilder.matchInport(PortNumber.portNumber(inport));
+            sbuilder.matchInPort(PortNumber.portNumber(inport));
             tbuilder.setOutput(PortNumber.portNumber(outport)).setLambda(lambda);
             break;
         case 2:
             inport = 21;
             outport = 11;
             sbuilder.matchLambda(lambda).
-                    matchInport(PortNumber.portNumber(inport)); // match sigtype
+                    matchInPort(PortNumber.portNumber(inport)); // match sigtype
             tbuilder.setOutput(PortNumber.portNumber(outport));
             break;
         case 3:
             inport = 30;
             outport = 31;
             sbuilder.matchLambda(lambda).
-                    matchInport(PortNumber.portNumber(inport));
+                    matchInPort(PortNumber.portNumber(inport));
             tbuilder.setOutput(PortNumber.portNumber(outport)).setLambda(lambda);
             break;
         default: