diff mbox

[ovs-dev] system-traffic: 802.1ad: Add double VLAN match test case

Message ID 20170601175927.12185-1-e@erig.me
State Accepted
Delegated to: Joe Stringer
Headers show

Commit Message

Eric Garver June 1, 2017, 5:59 p.m. UTC
Test case to match outer, pop outer, then match inner VLAN.

Signed-off-by: Eric Garver <e@erig.me>
---
 tests/system-traffic.at | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

Comments

Ben Pfaff June 8, 2017, 9:35 p.m. UTC | #1
Joe, are you the right person to review this?

Thanks,

Ben.

On Thu, Jun 01, 2017 at 01:59:27PM -0400, Eric Garver wrote:
> Test case to match outer, pop outer, then match inner VLAN.
> 
> Signed-off-by: Eric Garver <e@erig.me>
> ---
>  tests/system-traffic.at | 35 +++++++++++++++++++++++++++++++++++
>  1 file changed, 35 insertions(+)
> 
> diff --git a/tests/system-traffic.at b/tests/system-traffic.at
> index b19e7538a2ef..4b883a0eaa7e 100644
> --- a/tests/system-traffic.at
> +++ b/tests/system-traffic.at
> @@ -3772,3 +3772,38 @@ NS_CHECK_EXEC([at_ns0], [ping -q -c 1 -w 3 10.4.2.2], [1], [ignore])
>  
>  OVS_TRAFFIC_VSWITCHD_STOP(["/dropping VLAN \(0\|300\) packet received on dot1q-tunnel port/d"])
>  AT_CLEANUP
> +
> +AT_SETUP([802.1ad - double vlan match])
> +OVS_TRAFFIC_VSWITCHD_START([set Open_vSwitch . other_config:vlan-limit=0])
> +OVS_CHECK_8021AD()
> +
> +ADD_NAMESPACES(at_ns0, at_ns1)
> +
> +ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24")
> +ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24")
> +
> +ADD_SVLAN(p0, at_ns0, 4094, "10.255.2.1/24")
> +ADD_SVLAN(p1, at_ns1, 4094, "10.255.2.2/24")
> +
> +ADD_CVLAN(p0.4094, at_ns0, 100, "10.2.2.1/24")
> +ADD_CVLAN(p1.4094, at_ns1, 100, "10.2.2.2/24")
> +
> +AT_DATA([flows-br0.txt], [dnl
> +table=0,priority=1                action=drop
> +table=0,priority=100 dl_vlan=4094 action=pop_vlan,goto_table:1
> +table=1,priority=100 dl_vlan=100  action=push_vlan:0x88a8,mod_vlan_vid:4094,normal
> +])
> +AT_CHECK([ovs-ofctl --bundle add-flows br0 flows-br0.txt])
> +
> +OVS_WAIT_UNTIL([ip netns exec at_ns0 ping -c 1 10.2.2.2])
> +
> +NS_CHECK_EXEC([at_ns0], [ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | FORMAT_PING], [0], [dnl
> +3 packets transmitted, 3 received, 0% packet loss, time 0ms
> +])
> +
> +NS_CHECK_EXEC([at_ns0], [ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | FORMAT_PING], [0], [dnl
> +3 packets transmitted, 3 received, 0% packet loss, time 0ms
> +])
> +
> +OVS_TRAFFIC_VSWITCHD_STOP
> +AT_CLEANUP
> -- 
> 2.12.0
> 
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Joe Stringer June 8, 2017, 9:42 p.m. UTC | #2
Yes, I'm the right person.

At this point I'm looking for the tap device persistence issue to be
addressed before running it on my tester box which runs tests on a
variety of platforms.

On 8 June 2017 at 14:35, Ben Pfaff <blp@ovn.org> wrote:
> Joe, are you the right person to review this?
>
> Thanks,
>
> Ben.
>
> On Thu, Jun 01, 2017 at 01:59:27PM -0400, Eric Garver wrote:
>> Test case to match outer, pop outer, then match inner VLAN.
>>
>> Signed-off-by: Eric Garver <e@erig.me>
>> ---
>>  tests/system-traffic.at | 35 +++++++++++++++++++++++++++++++++++
>>  1 file changed, 35 insertions(+)
>>
>> diff --git a/tests/system-traffic.at b/tests/system-traffic.at
>> index b19e7538a2ef..4b883a0eaa7e 100644
>> --- a/tests/system-traffic.at
>> +++ b/tests/system-traffic.at
>> @@ -3772,3 +3772,38 @@ NS_CHECK_EXEC([at_ns0], [ping -q -c 1 -w 3 10.4.2.2], [1], [ignore])
>>
>>  OVS_TRAFFIC_VSWITCHD_STOP(["/dropping VLAN \(0\|300\) packet received on dot1q-tunnel port/d"])
>>  AT_CLEANUP
>> +
>> +AT_SETUP([802.1ad - double vlan match])
>> +OVS_TRAFFIC_VSWITCHD_START([set Open_vSwitch . other_config:vlan-limit=0])
>> +OVS_CHECK_8021AD()
>> +
>> +ADD_NAMESPACES(at_ns0, at_ns1)
>> +
>> +ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24")
>> +ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24")
>> +
>> +ADD_SVLAN(p0, at_ns0, 4094, "10.255.2.1/24")
>> +ADD_SVLAN(p1, at_ns1, 4094, "10.255.2.2/24")
>> +
>> +ADD_CVLAN(p0.4094, at_ns0, 100, "10.2.2.1/24")
>> +ADD_CVLAN(p1.4094, at_ns1, 100, "10.2.2.2/24")
>> +
>> +AT_DATA([flows-br0.txt], [dnl
>> +table=0,priority=1                action=drop
>> +table=0,priority=100 dl_vlan=4094 action=pop_vlan,goto_table:1
>> +table=1,priority=100 dl_vlan=100  action=push_vlan:0x88a8,mod_vlan_vid:4094,normal
>> +])
>> +AT_CHECK([ovs-ofctl --bundle add-flows br0 flows-br0.txt])
>> +
>> +OVS_WAIT_UNTIL([ip netns exec at_ns0 ping -c 1 10.2.2.2])
>> +
>> +NS_CHECK_EXEC([at_ns0], [ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | FORMAT_PING], [0], [dnl
>> +3 packets transmitted, 3 received, 0% packet loss, time 0ms
>> +])
>> +
>> +NS_CHECK_EXEC([at_ns0], [ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | FORMAT_PING], [0], [dnl
>> +3 packets transmitted, 3 received, 0% packet loss, time 0ms
>> +])
>> +
>> +OVS_TRAFFIC_VSWITCHD_STOP
>> +AT_CLEANUP
>> --
>> 2.12.0
>>
>> _______________________________________________
>> dev mailing list
>> dev@openvswitch.org
>> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Joe Stringer June 15, 2017, 11:49 p.m. UTC | #3
On 8 June 2017 at 14:42, Joe Stringer <joe@ovn.org> wrote:
> Yes, I'm the right person.
>
> At this point I'm looking for the tap device persistence issue to be
> addressed before running it on my tester box which runs tests on a
> variety of platforms.

Hi Eric,

I'm finding that things are still pretty unstable in the
system-traffic tests, particularly around kernels 4.8-4.9, but also
with regards to cleaning up properly after testsuite failures. Without
clean runs on master, it's a bit hard for me to run these tests as
well and observe that these tests are good on a range of kernels.
Eric Garver June 16, 2017, 12:15 a.m. UTC | #4
On Thu, Jun 15, 2017 at 04:49:17PM -0700, Joe Stringer wrote:
> On 8 June 2017 at 14:42, Joe Stringer <joe@ovn.org> wrote:
> > Yes, I'm the right person.
> >
> > At this point I'm looking for the tap device persistence issue to be
> > addressed before running it on my tester box which runs tests on a
> > variety of platforms.
> 
> Hi Eric,
> 
> I'm finding that things are still pretty unstable in the
> system-traffic tests, particularly around kernels 4.8-4.9, but also
> with regards to cleaning up properly after testsuite failures. Without
> clean runs on master, it's a bit hard for me to run these tests as
> well and observe that these tests are good on a range of kernels.

Understood. I don't think there is any rush to get this particular patch
in (or the IPv6 underlay tests for that matter). When you get back
around to it let me know when/if they need rebased.

Thanks.
Eric.
Joe Stringer July 14, 2017, 6:21 p.m. UTC | #5
On 15 June 2017 at 17:15, Eric Garver <e@erig.me> wrote:
> On Thu, Jun 15, 2017 at 04:49:17PM -0700, Joe Stringer wrote:
>> On 8 June 2017 at 14:42, Joe Stringer <joe@ovn.org> wrote:
>> > Yes, I'm the right person.
>> >
>> > At this point I'm looking for the tap device persistence issue to be
>> > addressed before running it on my tester box which runs tests on a
>> > variety of platforms.
>>
>> Hi Eric,
>>
>> I'm finding that things are still pretty unstable in the
>> system-traffic tests, particularly around kernels 4.8-4.9, but also
>> with regards to cleaning up properly after testsuite failures. Without
>> clean runs on master, it's a bit hard for me to run these tests as
>> well and observe that these tests are good on a range of kernels.
>
> Understood. I don't think there is any rush to get this particular patch
> in (or the IPv6 underlay tests for that matter). When you get back
> around to it let me know when/if they need rebased.
>
> Thanks.
> Eric.

No need - I just applied this to master. Thanks for your patience.
diff mbox

Patch

diff --git a/tests/system-traffic.at b/tests/system-traffic.at
index b19e7538a2ef..4b883a0eaa7e 100644
--- a/tests/system-traffic.at
+++ b/tests/system-traffic.at
@@ -3772,3 +3772,38 @@  NS_CHECK_EXEC([at_ns0], [ping -q -c 1 -w 3 10.4.2.2], [1], [ignore])
 
 OVS_TRAFFIC_VSWITCHD_STOP(["/dropping VLAN \(0\|300\) packet received on dot1q-tunnel port/d"])
 AT_CLEANUP
+
+AT_SETUP([802.1ad - double vlan match])
+OVS_TRAFFIC_VSWITCHD_START([set Open_vSwitch . other_config:vlan-limit=0])
+OVS_CHECK_8021AD()
+
+ADD_NAMESPACES(at_ns0, at_ns1)
+
+ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24")
+ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24")
+
+ADD_SVLAN(p0, at_ns0, 4094, "10.255.2.1/24")
+ADD_SVLAN(p1, at_ns1, 4094, "10.255.2.2/24")
+
+ADD_CVLAN(p0.4094, at_ns0, 100, "10.2.2.1/24")
+ADD_CVLAN(p1.4094, at_ns1, 100, "10.2.2.2/24")
+
+AT_DATA([flows-br0.txt], [dnl
+table=0,priority=1                action=drop
+table=0,priority=100 dl_vlan=4094 action=pop_vlan,goto_table:1
+table=1,priority=100 dl_vlan=100  action=push_vlan:0x88a8,mod_vlan_vid:4094,normal
+])
+AT_CHECK([ovs-ofctl --bundle add-flows br0 flows-br0.txt])
+
+OVS_WAIT_UNTIL([ip netns exec at_ns0 ping -c 1 10.2.2.2])
+
+NS_CHECK_EXEC([at_ns0], [ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | FORMAT_PING], [0], [dnl
+3 packets transmitted, 3 received, 0% packet loss, time 0ms
+])
+
+NS_CHECK_EXEC([at_ns0], [ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | FORMAT_PING], [0], [dnl
+3 packets transmitted, 3 received, 0% packet loss, time 0ms
+])
+
+OVS_TRAFFIC_VSWITCHD_STOP
+AT_CLEANUP