diff options
| author | Jarno Rajahalme <jarno@ovn.org> | 2016-02-24 16:10:42 -0800 |
|---|---|---|
| committer | Jarno Rajahalme <jarno@ovn.org> | 2016-02-24 16:10:42 -0800 |
| commit | 3fd12197cda71b79198a4802e298be783877370c (patch) | |
| tree | 1494bd23d1fb572b2b67f8df676395538513487f /tests/mpls-xlate.at | |
| parent | 8cffdcd071ed47a503edb211bfaa15639d265ee0 (diff) | |
| download | openvswitch-3fd12197cda71b79198a4802e298be783877370c.tar.gz | |
tests: Fix MPLS tests.
Some MPLS tests used non-MPLS ethertype for popping a label from a
multi-label stack. Also, reveal actions in some MPLS tests. This
will make later patches more easily understandable.
Fix the mpls-xlate banner and remove '-generate' option from MPLS
tests as it is no longer needed to create recirculation state.
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'tests/mpls-xlate.at')
| -rw-r--r-- | tests/mpls-xlate.at | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/mpls-xlate.at b/tests/mpls-xlate.at index 38790ea52..d06036f62 100644 --- a/tests/mpls-xlate.at +++ b/tests/mpls-xlate.at @@ -1,4 +1,4 @@ -AT_BANNER([mpls_xlate]) +AT_BANNER([mpls-xlate]) AT_SETUP([MPLS xlate action]) @@ -45,17 +45,17 @@ AT_CHECK([tail -1 stdout], [0], ]) dnl Double MPLS pop -AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x8847),mpls(label=60,tc=0/0,ttl=64,bos=0)' -generate], [0], [stdout]) +AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x8847),mpls(label=60,tc=0,ttl=64,bos=0)'], [0], [stdout]) AT_CHECK([tail -1 stdout], [0], [Datapath actions: pop_mpls(eth_type=0x8847),recirc(0x1) ]) -AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'recirc_id(1),in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x8847),mpls(label=50,tc=0/0,ttl=64,bos=0)' -generate], [0], [stdout]) +AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'recirc_id(1),in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x8847),mpls(label=50,tc=0,ttl=64,bos=0)'], [0], [stdout]) AT_CHECK([tail -1 stdout], [0], [Datapath actions: pop_mpls(eth_type=0x800),recirc(0x2) ]) -AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'recirc_id(2),in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x0800),ipv4(src=1.1.2.92,dst=1.1.2.88,proto=47,tos=0,ttl=64,frag=no)' -generate], [0], [stdout]) +AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'recirc_id(2),in_port(1),eth(src=f8:bc:12:44:34:b6,dst=f8:bc:12:46:58:e0),eth_type(0x0800),ipv4(src=1.1.2.92,dst=1.1.2.88,proto=47,tos=0,ttl=64,frag=no)'], [0], [stdout]) AT_CHECK([tail -1 stdout], [0], [Datapath actions: set(ipv4(ttl=10)),100 ]) |