java_gen: create DEFAULT instance for objects that support it (for Match)
Objects which consist only of parts that have a default value
now get a default value.
Match, in particular, now defines a default instance that wildcards
everything and is available as factory.matchWildcardAll()
diff --git a/java_gen/java_type.py b/java_gen/java_type.py
index 923b244..084fc6f 100644
--- a/java_gen/java_type.py
+++ b/java_gen/java_type.py
@@ -251,6 +251,9 @@
of_port = JType("OFPort") \
.op(version=1, read="OFPort.read2Bytes(bb)", write="$name.write2Bytes(bb)", default="OFPort.ANY") \
.op(version=ANY, read="OFPort.read4Bytes(bb)", write="$name.write4Bytes(bb)", default="OFPort.ANY")
+# the same OFPort, but with a default value of ZERO, only for OF10 match
+of_port_match_v1 = JType("OFPort") \
+ .op(version=1, read="OFPort.read2Bytes(bb)", write="$name.write2Bytes(bb)", default="OFPort.ZERO")
actions_list = JType('List<OFAction>') \
.op(read='ChannelUtils.readList(bb, $length, OFActionVer$version.READER)',
write='ChannelUtils.writeList(bb, $name);',
@@ -280,7 +283,8 @@
default="new byte[0]");
of_match = JType('Match') \
.op(read='ChannelUtilsVer$version.readOFMatch(bb)', \
- write='$name.writeTo(bb)');
+ write='$name.writeTo(bb)',
+ default="OFFactoryVer$version.MATCH_WILDCARD_ALL");
flow_mod_cmd = JType('OFFlowModCommand', 'short') \
.op(version=1, read="bb.readShort()", write="bb.writeShort($name)") \
.op(version=ANY, read="bb.readByte()", write="bb.writeByte($name)")
@@ -480,7 +484,8 @@
'of_table_stats_entry': { 'wildcards': table_stats_wildcards },
'of_match_v1': { 'vlan_vid' : vlan_vid, 'vlan_pcp': vlan_pcp,
'eth_type': eth_type, 'ip_dscp': ip_dscp, 'ip_proto': ip_proto,
- 'tcp_src': transport_port, 'tcp_dst': transport_port
+ 'tcp_src': transport_port, 'tcp_dst': transport_port,
+ 'in_port': of_port_match_v1
}
}