Added NXMs for source and destination tunnels. These are included by OVS in matches. C and Python unit tests pass. Java unit test fails with masked versions of the NXMs.
diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
index 39c15fd..e956f78 100644
--- a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
+++ b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
@@ -190,6 +190,14 @@
public final static MatchField<OFBooleanValue> PBB_UCA =
new MatchField<OFBooleanValue>("pbb_uca", MatchFields.PBB_UCA);
+
+ public final static MatchField<IPv4Address> TUNNEL_IPV4_SRC =
+ new MatchField<IPv4Address>("tunnel_ipv4_src", MatchFields.TUNNEL_IPV4_SRC,
+ new Prerequisite<EthType>(MatchField.ETH_TYPE, EthType.IPv4));
+
+ public final static MatchField<IPv4Address> TUNNEL_IPV4_DST =
+ new MatchField<IPv4Address>("tunnel_ipv4_dst", MatchFields.TUNNEL_IPV4_DST,
+ new Prerequisite<EthType>(MatchField.ETH_TYPE, EthType.IPv4));
public final static MatchField<OFBitMask128> BSN_IN_PORTS_128 =
new MatchField<OFBitMask128>("bsn_in_ports_128", MatchFields.BSN_IN_PORTS_128);
diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java
index aaf3576..28b6f8c 100644
--- a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java
+++ b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java
@@ -42,6 +42,8 @@
TUNNEL_ID,
IPV6_EXTHDR,
PBB_UCA,
+ TUNNEL_IPV4_SRC,
+ TUNNEL_IPV4_DST,
BSN_IN_PORTS_128,
BSN_LAG_ID,
BSN_VRF,