commit 538d51fa08b24c9cba96bf12306e9f75fa41ba78
author Patryk Konopka <p.konopka2@samsung.com> Wed Mar 01 10:14:52 2017 +0100
committer Yuta HIGUCHI <y-higuchi@opennetworking.org> Tue Jun 20 15:45:08 2017 +0000
tree 13f76e32f658e931a7eb026da74d87764e8e3f8d
parent 9816afaf4716c89be4fa5a3e85155d4b7a1644ea

[ONOS-6064] Support for IPv6 tunnel (currently supported in Open vSwitch 2.6.0)

Change-Id: Iff47f110ee25b4a65830c939bbd540350e07575d

java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java

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 33a6736..3868482 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
@@ -233,6 +233,14 @@
             new MatchField<IPv4Address>("tunnel_ipv4_dst", MatchFields.TUNNEL_IPV4_DST,
                     new Prerequisite<EthType>(MatchField.ETH_TYPE, EthType.IPv4));
 
+    public final static MatchField<IPv6Address> TUNNEL_IPV6_SRC =
+            new MatchField<IPv6Address>("tunnel_ipv6_src", MatchFields.TUNNEL_IPV6_SRC,
+                    new Prerequisite<EthType>(MatchField.ETH_TYPE, EthType.IPv6));
+
+    public final static MatchField<IPv6Address> TUNNEL_IPV6_DST =
+            new MatchField<IPv6Address>("tunnel_ipv6_dst", MatchFields.TUNNEL_IPV6_DST,
+                    new Prerequisite<EthType>(MatchField.ETH_TYPE, EthType.IPv6));
+
     public final static MatchField<OFBitMask128> BSN_IN_PORTS_128 =
             new MatchField<OFBitMask128>("bsn_in_ports_128", MatchFields.BSN_IN_PORTS_128);
 

java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java

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 3f86466..195cb7f 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
@@ -53,6 +53,8 @@
     ACTSET_OUTPUT,
     TUNNEL_IPV4_SRC,
     TUNNEL_IPV4_DST,
+    TUNNEL_IPV6_SRC,
+    TUNNEL_IPV6_DST,
     BSN_IN_PORTS_128,
     BSN_IN_PORTS_512,
     BSN_LAG_ID,

openflow_input/oxm_nicira_tun

diff --git a/openflow_input/oxm_nicira_tun b/openflow_input/oxm_nicira_tun
index ae2575f..c3d0e01 100644
--- a/openflow_input/oxm_nicira_tun
+++ b/openflow_input/oxm_nicira_tun
@@ -54,6 +54,12 @@
     of_ipv4_t value_mask;
 };
 
+// Nicira extension for tun_ipv6_dst
+struct of_oxm_tunnel_ipv6_dst : of_oxm {
+    uint32_t type_len == 0x0001dc10;
+    of_ipv6_t value;
+};
+
 // Nicira extension for tun_flags (104)
 struct of_oxm_tun_flags : of_oxm {
     uint32_t type_len == 0x0001d002;