From 6b29a5bebb957387fe1aac8fcbfd431e6be237f0 Mon Sep 17 00:00:00 2001 From: Arturo Borrero Date: Fri, 11 Dec 2015 11:10:14 +0100 Subject: tests/: rearrange tests directory Rearrange the directory to obtain a better organization of files and tests-suites. We end with a tree like this: tests | .--- py .--- shell .--- files This was suggested by Pablo. Signed-off-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso --- tests/regression/bridge/vlan.t.payload | 201 --------------------------------- 1 file changed, 201 deletions(-) delete mode 100644 tests/regression/bridge/vlan.t.payload (limited to 'tests/regression/bridge/vlan.t.payload') diff --git a/tests/regression/bridge/vlan.t.payload b/tests/regression/bridge/vlan.t.payload deleted file mode 100644 index 02242d22..00000000 --- a/tests/regression/bridge/vlan.t.payload +++ /dev/null @@ -1,201 +0,0 @@ -# vlan id 4094 -bridge test-bridge input - [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] - [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000fe0f ] - -# vlan id 0 -bridge test-bridge input - [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] - [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000000 ] - -# vlan id 4094 vlan cfi 0 -bridge test-bridge input - [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] - [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000fe0f ] - [ payload load 1b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x00000010 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000000 ] - -# vlan id 4094 vlan cfi != 1 -bridge test-bridge input - [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] - [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000fe0f ] - [ payload load 1b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x00000010 ) ^ 0x00000000 ] - [ cmp neq reg 1 0x00000010 ] - -# vlan id 4094 vlan cfi 1 -bridge test-bridge input - [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] - [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000fe0f ] - [ payload load 1b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x00000010 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000010 ] - -# ether type vlan vlan id 4094 -bridge test-bridge input - [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] - [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000fe0f ] - -# ether type vlan vlan id 0 -bridge test-bridge input - [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] - [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000000 ] - -# ether type vlan vlan id 4094 vlan cfi 0 -bridge test-bridge input - [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] - [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000fe0f ] - [ payload load 1b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x00000010 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000000 ] - -# ether type vlan vlan id 4094 vlan cfi 1 -bridge test-bridge input - [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] - [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000fe0f ] - [ payload load 1b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x00000010 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000010 ] - -# vlan id 4094 tcp dport 22 -bridge test-bridge input - [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] - [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000fe0f ] - [ meta load l4proto => reg 1 ] - [ cmp eq reg 1 0x00000006 ] - [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] - -# vlan id 1 ip saddr 10.0.0.1 -bridge test-bridge input - [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] - [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000100 ] - [ payload load 2b @ link header + 16 => reg 1 ] - [ cmp eq reg 1 0x00000008 ] - [ payload load 4b @ network header + 12 => reg 1 ] - [ cmp eq reg 1 0x0100000a ] - -# vlan id 1 ip saddr 10.0.0.0/23 -bridge test-bridge input - [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] - [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000100 ] - [ payload load 2b @ link header + 16 => reg 1 ] - [ cmp eq reg 1 0x00000008 ] - [ payload load 4b @ network header + 12 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x00feffff ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000000a ] - -# vlan id 1 ip saddr 10.0.0.0/23 udp dport 53 -bridge test-bridge input - [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] - [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000100 ] - [ payload load 2b @ link header + 16 => reg 1 ] - [ cmp eq reg 1 0x00000008 ] - [ payload load 4b @ network header + 12 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x00feffff ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000000a ] - [ payload load 1b @ network header + 9 => reg 1 ] - [ cmp eq reg 1 0x00000011 ] - [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] - -# ether type vlan vlan id 1 ip saddr 10.0.0.0/23 udp dport 53 -bridge test-bridge input - [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] - [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000100 ] - [ payload load 2b @ link header + 16 => reg 1 ] - [ cmp eq reg 1 0x00000008 ] - [ payload load 4b @ network header + 12 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x00feffff ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000000a ] - [ payload load 1b @ network header + 9 => reg 1 ] - [ cmp eq reg 1 0x00000011 ] - [ payload load 2b @ transport header + 2 => reg 1 ] - [ cmp eq reg 1 0x00003500 ] - -# vlan id 4094 vlan cfi 1 vlan pcp 7 -bridge test-bridge input - [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] - [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000fe0f ] - [ payload load 1b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x00000010 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000010 ] - [ payload load 1b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x000000e0 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x000000e0 ] - -# vlan id 4094 vlan cfi 1 vlan pcp 3 -bridge test-bridge input - [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] - [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ cmp eq reg 1 0x0000fe0f ] - [ payload load 1b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x00000010 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000010 ] - [ payload load 1b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x000000e0 ) ^ 0x00000000 ] - [ cmp eq reg 1 0x00000060 ] - -# vlan id { 1, 2, 4, 100, 4095 } vlan pcp 1-3 -set%d test-bridge 3 -set%d test-bridge 0 - element 00000100 : 0 [end] element 00000200 : 0 [end] element 00000400 : 0 [end] element 00006400 : 0 [end] element 0000ff0f : 0 [end] -bridge test-bridge input - [ payload load 2b @ link header + 12 => reg 1 ] - [ cmp eq reg 1 0x00000081 ] - [ payload load 2b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x0000ff0f ) ^ 0x00000000 ] - [ lookup reg 1 set set%d ] - [ payload load 1b @ link header + 14 => reg 1 ] - [ bitwise reg 1 = (reg=1 & 0x000000e0 ) ^ 0x00000000 ] - [ cmp gte reg 1 0x00000001 ] - [ cmp lte reg 1 0x00000003 ] - -- cgit v1.2.3