commit 0f9aba8e716a183f6dc0c0eba678f09b0c1614bd
author Kunihiro Ishiguro <kunihiroishiguro@gmail.com> Thu Jan 15 17:14:17 2015 -0800
committer Pavlin Radoslavov <pavlin@onlab.us> Sat Jan 17 17:27:16 2015 +0000
tree 02e6ddbcda5d3c10ce4ca9dbbbe7676647911400
parent f84591d3facc79f9e67cc3fd97a3b8ae413a1cd8

ONOS-635 Adding ICMPv6 type and code builder for HostMonitor.

aovid duplicate call of toString.

Apply changes to FlowEntryBuilder and FlowModBuilder as well.
Fix missing break; issue.

Change-Id: I1a2e59ca943bbcc9677b9fc0cb9eb2f7cb3d7aa3

providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java

diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java
index 58a5720..78efee2 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java
@@ -31,6 +31,8 @@
 import org.onosproject.net.flow.criteria.Criteria.TcpPortCriterion;
 import org.onosproject.net.flow.criteria.Criteria.VlanIdCriterion;
 import org.onosproject.net.flow.criteria.Criteria.VlanPcpCriterion;
+import org.onosproject.net.flow.criteria.Criteria.Icmpv6TypeCriterion;
+import org.onosproject.net.flow.criteria.Criteria.Icmpv6CodeCriterion;
 import org.onosproject.net.flow.criteria.Criterion;
 import org.onlab.packet.Ip4Address;
 import org.onlab.packet.Ip4Prefix;
@@ -254,6 +256,16 @@
                             IPv6Address.of(ip6Prefix.address().toString()));
                 }
                 break;
+            case ICMPV6_TYPE:
+                Icmpv6TypeCriterion icmpv6type = (Icmpv6TypeCriterion) c;
+                mBuilder.setExact(MatchField.ICMPV6_TYPE,
+                        U8.of(icmpv6type.icmpv6Type().byteValue()));
+                break;
+            case ICMPV6_CODE:
+                Icmpv6CodeCriterion icmpv6code = (Icmpv6CodeCriterion) c;
+                mBuilder.setExact(MatchField.ICMPV6_CODE,
+                        U8.of(icmpv6code.icmpv6Code().byteValue()));
+                break;
             case ARP_OP:
             case ARP_SHA:
             case ARP_SPA:
@@ -261,8 +273,6 @@
             case ARP_TPA:
             case ICMPV4_CODE:
             case ICMPV4_TYPE:
-            case ICMPV6_CODE:
-            case ICMPV6_TYPE:
             case IN_PHY_PORT:
             case IPV6_EXTHDR:
             case IPV6_FLABEL: