commit 376cef52790f7016ef017e12716b5977efe7b841
author Andreas Wundsam <andreas.wundsam@bigswitch.com> Tue Sep 24 13:52:18 2013 -0700
committer Andreas Wundsam <andreas.wundsam@bigswitch.com> Tue Sep 24 13:52:18 2013 -0700
tree f97dab7c509840afcaeebfb82e804e557f2afd35
parent cfa723f43b3de70bd73b4e49dfc7c764b1a737c3

java_gen: add MaskedEnumGroup fro OFTableConfig.TABLE_MISS

remove unused var

java_gen/java_model.py

diff --git a/java_gen/java_model.py b/java_gen/java_model.py
index 76a584c..17a7fc8 100644
--- a/java_gen/java_model.py
+++ b/java_gen/java_model.py
@@ -159,7 +159,10 @@
             OFPortState = (MaskedEnumGroup("stp_flags", mask="STP_MASK", members=set(("STP_LISTEN", "STP_LEARN", "STP_FORWARD", "STP_BLOCK"))), ),
             OFConfigFlags = (
                 MaskedEnumGroup("frag_flags", mask="FRAG_MASK", members=set(("FRAG_NORMAL", "FRAG_DROP", "FRAG_REASM"))),
-            )
+            ),
+            OFTableConfig = (
+                MaskedEnumGroup("table_miss_flags", mask="TABLE_MISS_MASK", members=set(("TABLE_MISS_CONTROLLER", "TABLE_MISS_CONTINUE", "TABLE_MISS_DROP"))),
+            ),
     )
 
     # represents a metadata property associated with an EnumClass

java_gen/templates/custom/OFMatchV1Ver10.java

diff --git a/java_gen/templates/custom/OFMatchV1Ver10.java b/java_gen/templates/custom/OFMatchV1Ver10.java
index 7b1f110..eaaacb0 100644
--- a/java_gen/templates/custom/OFMatchV1Ver10.java
+++ b/java_gen/templates/custom/OFMatchV1Ver10.java
@@ -119,7 +119,6 @@
                 result = IPv4AddressWithMask.of(ipv4Src, IPv4Address.of(srcBitMask));
                 break;
             case IPV4_DST:
-                int dstMaskedBits = Math.min(32, (wildcards & OFPFW_NW_DST_MASK) >> OFPFW_NW_DST_SHIFT);
                 int dstBitMask = (-1) << (32 - getIpv4DstCidrMaskLen());
 
                 result = IPv4AddressWithMask.of(ipv4Dst, IPv4Address.of(dstBitMask));