Reenable disabled test

Reenable the test: "incoming ICMPv6 3,0 hop limit exceeded, OPE hairpinned".
snabbco · Aug 5, 2016 · fec3c27 · fec3c27
1 parent f78bd20
commit fec3c27
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 23 deletions.
diff --git a/...ata/counters/in-1p-ipv6-out-1p-icmpv4.lua → ...a/counters/in-1p-ipv6-out-1p-icmpv4-1.lua b/...ata/counters/in-1p-ipv6-out-1p-icmpv4.lua → ...a/counters/in-1p-ipv6-out-1p-icmpv4-1.lua
diff --git a/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-icmpv4-2.lua b/src/program/lwaftr/tests/data/counters/in-1p-ipv6-out-1p-icmpv4-2.lua
@@ -0,0 +1,10 @@
+return {
+   ["in-ipv6-bytes"] = 154,
+   ["in-ipv6-packets"] = 1,
+
+   ["out-ipv6-bytes"] = 134,
+   ["out-ipv6-packets"] = 1,
+
+   ["out-icmpv4-bytes"] = 94,
+   ["out-icmpv4-packets"] = 1,
+}
diff --git a/src/program/lwaftr/tests/end-to-end/end-to-end-vlan.sh b/src/program/lwaftr/tests/end-to-end/end-to-end-vlan.sh
@@ -351,19 +351,19 @@ echo "Testing: incoming ICMPv6 1,3 destination/address unreachable, OPE from int
 snabb_run_and_cmp ${TEST_CONF}/tunnel_icmp_vlan.conf \
    ${EMPTY} ${TEST_DATA}/incoming-icmpv6-13dstaddressunreach-inet-OPE.pcap \
    ${TEST_DATA}/response-ipv4-icmp31-inet.pcap ${EMPTY} \
-   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4.lua
+   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4-1.lua
 
 echo "Testing: incoming ICMPv6 2,0 'too big' notification, OPE from internet"
 snabb_run_and_cmp ${TEST_CONF}/tunnel_icmp_vlan.conf \
    ${EMPTY} ${TEST_DATA}/incoming-icmpv6-20pkttoobig-inet-OPE.pcap \
    ${TEST_DATA}/response-ipv4-icmp34-inet.pcap ${EMPTY} \
-   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4.lua
+   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4-1.lua
 
 echo "Testing: incoming ICMPv6 3,0 hop limit exceeded, OPE from internet"
 snabb_run_and_cmp ${TEST_CONF}/tunnel_icmp_vlan.conf \
    ${EMPTY} ${TEST_DATA}/incoming-icmpv6-30hoplevelexceeded-inet-OPE.pcap \
    ${TEST_DATA}/response-ipv4-icmp31-inet.pcap ${EMPTY} \
-   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4.lua
+   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4-1.lua
 
 echo "Testing: incoming ICMPv6 3,1 frag reasembly time exceeded, OPE from internet"
 snabb_run_and_cmp ${TEST_CONF}/tunnel_icmp_vlan.conf \
@@ -375,14 +375,13 @@ echo "Testing: incoming ICMPv6 4,3 parameter problem, OPE from internet"
 snabb_run_and_cmp ${TEST_CONF}/tunnel_icmp_vlan.conf \
    ${EMPTY} ${TEST_DATA}/incoming-icmpv6-43paramprob-inet-OPE.pcap \
    ${TEST_DATA}/response-ipv4-icmp31-inet.pcap ${EMPTY} \
-   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4.lua
-
-# FIXME: fix and reenable this test.
-# echo "Testing: incoming ICMPv6 3,0 hop limit exceeded, OPE hairpinned"
-# snabb_run_and_cmp ${TEST_CONF}/tunnel_icmp_vlan.conf \
-#    ${EMPTY} ${TEST_DATA}/incoming-icmpv6-30hoplevelexceeded-hairpinned-OPE.pcap \
-#    ${EMPTY} ${TEST_DATA}/response-ipv6-tunneled-icmpv4_31-tob4.pcap \
-#    ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4.lua
+   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4-1.lua
+
+echo "Testing: incoming ICMPv6 3,0 hop limit exceeded, OPE hairpinned"
+snabb_run_and_cmp ${TEST_CONF}/tunnel_icmp_vlan.conf \
+   ${EMPTY} ${TEST_DATA}/incoming-icmpv6-30hoplevelexceeded-hairpinned-OPE.pcap \
+   ${EMPTY} ${TEST_DATA}/response-ipv6-tunneled-icmpv4_31-tob4.pcap \
+   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4-2.lua
 
 # Ingress filters
 

diff --git a/src/program/lwaftr/tests/end-to-end/end-to-end.sh b/src/program/lwaftr/tests/end-to-end/end-to-end.sh
@@ -374,21 +374,21 @@ echo "Testing: incoming ICMPv6 1,3 destination/address unreachable, OPE from int
 snabb_run_and_cmp ${TEST_BASE}/tunnel_icmp.conf \
    ${EMPTY} ${TEST_BASE}/incoming-icmpv6-13dstaddressunreach-inet-OPE.pcap \
    ${TEST_BASE}/response-ipv4-icmp31-inet.pcap ${EMPTY} \
-   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4.lua
+   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4-1.lua
 
 echo "Testing: incoming ICMPv6 2,0 'too big' notification, OPE from internet"
 snabb_run_and_cmp ${TEST_BASE}/tunnel_icmp.conf \
    ${EMPTY} ${TEST_BASE}/incoming-icmpv6-20pkttoobig-inet-OPE.pcap \
    ${TEST_BASE}/response-ipv4-icmp34-inet.pcap ${EMPTY} \
-   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4.lua
+   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4-1.lua
 
 echo "Testing: incoming ICMPv6 3,0 hop limit exceeded, OPE from internet"
 snabb_run_and_cmp ${TEST_BASE}/tunnel_icmp.conf \
    ${EMPTY} ${TEST_BASE}/incoming-icmpv6-30hoplevelexceeded-inet-OPE.pcap \
    ${TEST_BASE}/response-ipv4-icmp31-inet.pcap ${EMPTY} \
-   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4.lua
+   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4-1.lua
 
-echo "Testing: incoming ICMPv6 3,1 frag reasembly time exceeded, OPE from internet"
+echo "Testing: incoming ICMPv6 3,1 frag reassembly time exceeded, OPE from internet"
 snabb_run_and_cmp ${TEST_BASE}/tunnel_icmp.conf \
    ${EMPTY} ${TEST_BASE}/incoming-icmpv6-31fragreassemblytimeexceeded-inet-OPE.pcap \
    ${EMPTY} ${EMPTY} \
@@ -398,14 +398,13 @@ echo "Testing: incoming ICMPv6 4,3 parameter problem, OPE from internet"
 snabb_run_and_cmp ${TEST_BASE}/tunnel_icmp.conf \
    ${EMPTY} ${TEST_BASE}/incoming-icmpv6-43paramprob-inet-OPE.pcap \
    ${TEST_BASE}/response-ipv4-icmp31-inet.pcap ${EMPTY} \
-   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4.lua
-
-# FIXME: fix and reenable this test.
-# echo "Testing: incoming ICMPv6 3,0 hop limit exceeded, OPE hairpinned"
-# snabb_run_and_cmp ${TEST_BASE}/tunnel_icmp.conf \
-#    ${EMPTY} ${TEST_BASE}/incoming-icmpv6-30hoplevelexceeded-hairpinned-OPE.pcap \
-#    ${EMPTY} ${TEST_BASE}/response-ipv6-tunneled-icmpv4_31-tob4.pcap \
-#    ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4.lua
+   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4-1.lua
+
+echo "Testing: incoming ICMPv6 3,0 hop limit exceeded, OPE hairpinned"
+snabb_run_and_cmp ${TEST_BASE}/tunnel_icmp.conf \
+   ${EMPTY} ${TEST_BASE}/incoming-icmpv6-30hoplevelexceeded-hairpinned-OPE.pcap \
+   ${EMPTY} ${TEST_BASE}/response-ipv6-tunneled-icmpv4_31-tob4.pcap \
+   ${COUNTERS}/in-1p-ipv6-out-1p-icmpv4-2.lua
 
 # Ingress filters