commit 595c6441677b29d9b040b27faf325e5c98f1438b
author Yotam Harchol <yotam.harchol@bigswitch.com> Fri Sep 27 16:29:08 2013 -0700
committer Yotam Harchol <yotam.harchol@bigswitch.com> Fri Sep 27 16:29:08 2013 -0700
tree 93f3cfb6a628d7eb9e9a6b489b53ede8510db293
parent 387a3bf68e03bded7beae5269b5df1116e2f758a

Fixes to in ports masked

Conflicts:
	test_data/of13/oxm_bsn_in_ports_masked_128.data

java_gen/java_type.py

diff --git a/java_gen/java_type.py b/java_gen/java_type.py
index 035b11e..b6365d8 100644
--- a/java_gen/java_type.py
+++ b/java_gen/java_type.py
@@ -380,10 +380,10 @@
 table_stats_wildcards = JType("int") \
         .op(read='bb.readInt()',
             write='bb.writeInt($name)')
-port_map = JType('OFPortMap') \
-            .op(read='OFPortMap.read16Bytes(bb)',
+port_bitmap = JType('OFPortBitmap') \
+            .op(read='OFPortBitmap.read16Bytes(bb)',
                 write='$name.write16Bytes(bb)',
-                default='OFPortMap.NONE')
+                default='OFPortBitmap.NONE')
 
 
 port_speed = JType("PortSpeed")
@@ -421,7 +421,7 @@
         'of_wc_bmap_t': flow_wildcards,
         'of_oxm_t': oxm,
         'of_meter_features_t': meter_features,
-        'of_bitmap_128': port_map
+        'of_bitmap_128_t': port_bitmap
         }
 
 ## Map that defines exceptions from the standard loxi->java mapping scheme
@@ -476,7 +476,8 @@
         'of_oxm_mpls_tc' : { 'value' : u8obj },
         'of_oxm_mpls_tc_masked' : { 'value' : u8obj, 'value_mask' : u8obj },
         
-        'of_oxm_bsn_in_ports_masked_128' : { 'value': port_map, 'value_mask': port_map },
+        'of_oxm_bsn_in_ports_128' : { 'value': port_bitmap },
+        'of_oxm_bsn_in_ports_128_masked' : { 'value': port_bitmap, 'value_mask': port_bitmap },
 
         'of_table_stats_entry': { 'wildcards': table_stats_wildcards },
         'of_match_v1': { 'vlan_vid' : vlan_vid, 'vlan_pcp': vlan_pcp,