commit 5395e64a15dcca1547aa17139486c8567896f665
author zhiyong ke <ke.zhiyong@zte.com.cn> Thu Jul 20 18:36:06 2017 +0800
committer Carmelo Cascone <carmelo@opennetworking.org> Tue Jul 25 06:20:48 2017 +0000
tree 3fe2617c1869a6037188d22b3f76b14c2d97703a
parent b465ed673121094573120c9a5c3a4f92490b3df7

ONOS-6824 Unit tests for Translation of all criterion types in PiFlowRuleTranslationService

Change-Id: Id775d2d002c298930e9e754739917040f2dd7ccc

core/net/src/main/java/org/onosproject/net/pi/impl/CriterionTranslators.java

diff --git a/core/net/src/main/java/org/onosproject/net/pi/impl/CriterionTranslators.java b/core/net/src/main/java/org/onosproject/net/pi/impl/CriterionTranslators.java
index a5d676e..6ade434 100644
--- a/core/net/src/main/java/org/onosproject/net/pi/impl/CriterionTranslators.java
+++ b/core/net/src/main/java/org/onosproject/net/pi/impl/CriterionTranslators.java
@@ -35,7 +35,6 @@
 import org.onosproject.net.flow.criteria.IcmpTypeCriterion;
 import org.onosproject.net.flow.criteria.Icmpv6CodeCriterion;
 import org.onosproject.net.flow.criteria.Icmpv6TypeCriterion;
-import org.onosproject.net.flow.criteria.LambdaCriterion;
 import org.onosproject.net.flow.criteria.MetadataCriterion;
 import org.onosproject.net.flow.criteria.MplsBosCriterion;
 import org.onosproject.net.flow.criteria.MplsCriterion;
@@ -248,17 +247,6 @@
     }
 
     /**
-     * Translator of LambdaCriterion.
-     */
-    static final class LambdaCriterionTranslator extends AbstractCriterionTranslator {
-        @Override
-        public void init(Criterion criterion, int bitWidth) throws ByteSequenceTrimException {
-            LambdaCriterion c = (LambdaCriterion) criterion;
-            initAsExactMatch(copyFrom(c.lambda()), bitWidth);
-        }
-    }
-
-    /**
      * Translator of MetadataCriterion.
      */
     static final class MetadataCriterionTranslator extends AbstractCriterionTranslator {
@@ -276,7 +264,7 @@
         @Override
         public void init(Criterion criterion, int bitWidth) throws ByteSequenceTrimException {
             MplsBosCriterion c = (MplsBosCriterion) criterion;
-            initAsExactMatch(copyFrom(c.mplsBos() ? 0 : 1), bitWidth);
+            initAsExactMatch(copyFrom(c.mplsBos() ? 1 : 0), bitWidth);
         }
     }
 
@@ -355,7 +343,6 @@
                 ImmutableByteSequence mask = copyFrom(c.mask().toInt());
                 initAsTernaryMatch(value, mask, bitWidth);
             }
-
         }
     }
 
@@ -382,7 +369,7 @@
     }
 
     /**
-     * Translator of  ArpHaCriterion.
+     * Translator of ArpHaCriterion.
      */
     static final class ArpHaCriterionTranslator extends AbstractCriterionTranslator {
         @Override
@@ -424,4 +411,5 @@
             initAsExactMatch(copyFrom(c.ipEcn()), bitWidth);
         }
     }
+
 }