git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto-dpif.at: Remove push_vlan from an OF1.0 test.
[sliver-openvswitch.git]
/
tests
/
ofp-actions.at
diff --git
a/tests/ofp-actions.at
b/tests/ofp-actions.at
index
8a40eb4
..
ebad040
100644
(file)
--- a/
tests/ofp-actions.at
+++ b/
tests/ofp-actions.at
@@
-114,6
+114,9
@@
ffff 0010 00002320 0014 04d2 162e 02 00
# actions=dec_ttl(32768,12345,90,765,1024)
ffff 0020 00002320 0015 000500000000 80003039005A02fd 0400000000000000
# actions=dec_ttl(32768,12345,90,765,1024)
ffff 0020 00002320 0015 000500000000 80003039005A02fd 0400000000000000
+# actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678)
+ffff 0018 00002320 001d 3039 00005BA0 00008707 0000B26E
+
])
sed '/^[[#&]]/d' < test-data > input.txt
sed -n 's/^# //p; /^$/p' < test-data > expout
])
sed '/^[[#&]]/d' < test-data > input.txt
sed -n 's/^# //p; /^$/p' < test-data > expout
@@
-289,6
+292,9
@@
ffff 0010 00002320 0014 04d2 162e 02 00
# actions=dec_ttl(32768,12345,90,765,1024)
ffff 0020 00002320 0015 000500000000 80003039005A02fd 0400000000000000
# actions=dec_ttl(32768,12345,90,765,1024)
ffff 0020 00002320 0015 000500000000 80003039005A02fd 0400000000000000
+# actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678)
+ffff 0018 00002320 001d 3039 00005BA0 00008707 0000B26E
+
])
sed '/^[[#&]]/d' < test-data > input.txt
sed -n 's/^# //p; /^$/p' < test-data > expout
])
sed '/^[[#&]]/d' < test-data > input.txt
sed -n 's/^# //p; /^$/p' < test-data > expout
@@
-333,7
+339,7
@@
dnl Check that an empty Apply-Actions instruction gets dropped.
0004 0008 00000000
dnl Duplicate instruction type:
0004 0008 00000000
dnl Duplicate instruction type:
-# bad OF1.1 instructions: O
FPBAC_UNSUPPORTED_ORDER
+# bad OF1.1 instructions: O
NFBIC_DUP_INSTRUCTION
0004 0008 00000000 0004 0008 00000000
dnl Instructions not multiple of 8 in length.
0004 0008 00000000 0004 0008 00000000
dnl Instructions not multiple of 8 in length.
@@
-350,6
+356,10
@@
dnl Goto-Table 1 instruction non-zero padding
# 7: 01 -> 00
0001 0008 01 000001
# 7: 01 -> 00
0001 0008 01 000001
+dnl Goto-Table 1 instruction go back to the previous table.
+# bad OF1.1 instructions: OFPBRC_BAD_TABLE_ID
+2,0001 0008 01 000000
+
dnl Goto-Table 1
# actions=goto_table:1
0001 0008 01 000000
dnl Goto-Table 1
# actions=goto_table:1
0001 0008 01 000000
@@
-371,7
+381,7
@@
dnl Write-Metadata too long.
0002 0020 00000000 fedcba9876543210 ffffffffffffffff 0000000000000000
dnl Write-Metadata duplicated.
0002 0020 00000000 fedcba9876543210 ffffffffffffffff 0000000000000000
dnl Write-Metadata duplicated.
-# bad OF1.1 instructions: O
FPBAC_UNSUPPORTED_ORDER
+# bad OF1.1 instructions: O
NFBIC_DUP_INSTRUCTION
0002 0018 00000000 fedcba9876543210 ff00ff00ff00ff00 0002 0018 00000000 fedcba9876543210 ff00ff00ff00ff00
dnl Write-Metadata in wrong position (OpenFlow 1.1+ disregards the order
0002 0018 00000000 fedcba9876543210 ff00ff00ff00ff00 0002 0018 00000000 fedcba9876543210 ff00ff00ff00ff00
dnl Write-Metadata in wrong position (OpenFlow 1.1+ disregards the order