diff options
| author | Ben Pfaff <blp@ovn.org> | 2018-05-25 17:11:07 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2018-06-11 15:32:00 -0700 |
| commit | 5a0e4aec1af5cf7741c490bce704577e51e536b9 (patch) | |
| tree | 0115e5184d50e22d6f6e7c7bd87a2690bdcc6ca4 /tests | |
| parent | 7be29a47576dce715f9c8b2b4f673fa623728ed0 (diff) | |
| download | openvswitch-5a0e4aec1af5cf7741c490bce704577e51e536b9.tar.gz | |
treewide: Convert leading tabs to spaces.
It's always been OVS coding style to use spaces rather than tabs for
indentation, but some tabs have snuck in over time. This commit converts
them to spaces.
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bfd.at | 12 | ||||
| -rw-r--r-- | tests/cfm.at | 12 | ||||
| -rw-r--r-- | tests/classifier.at | 2 | ||||
| -rw-r--r-- | tests/dpif-netdev.at | 4 | ||||
| -rw-r--r-- | tests/interface-reconfigure.at | 1112 | ||||
| -rw-r--r-- | tests/lacp.at | 12 | ||||
| -rw-r--r-- | tests/ofproto-dpif.at | 992 | ||||
| -rw-r--r-- | tests/ofproto-macros.at | 12 | ||||
| -rw-r--r-- | tests/ofproto.at | 40 | ||||
| -rw-r--r-- | tests/ovn.at | 12 | ||||
| -rw-r--r-- | tests/ovs-macros.at | 4 | ||||
| -rw-r--r-- | tests/ovs-ofctl.at | 14 | ||||
| -rw-r--r-- | tests/ovs-router.at | 4 | ||||
| -rw-r--r-- | tests/ovsdb-client.at | 12 | ||||
| -rw-r--r-- | tests/ovsdb-cluster.at | 126 | ||||
| -rw-r--r-- | tests/ovsdb-condition.at | 6 | ||||
| -rw-r--r-- | tests/ovsdb-idl.at | 2 | ||||
| -rw-r--r-- | tests/ovsdb-log.at | 32 | ||||
| -rw-r--r-- | tests/ovsdb-monitor.at | 12 | ||||
| -rw-r--r-- | tests/ovsdb-mutation.at | 6 | ||||
| -rw-r--r-- | tests/ovsdb-query.at | 6 | ||||
| -rw-r--r-- | tests/ovsdb-row.at | 6 | ||||
| -rw-r--r-- | tests/ovsdb-schema.at | 22 | ||||
| -rw-r--r-- | tests/ovsdb-server.at | 170 | ||||
| -rw-r--r-- | tests/ovsdb-tool.at | 20 | ||||
| -rw-r--r-- | tests/pmd.at | 92 | ||||
| -rwxr-xr-x | tests/run-oftest | 10 | ||||
| -rwxr-xr-x | tests/run-ryu | 6 | ||||
| -rw-r--r-- | tests/test-lib.c | 2 | ||||
| -rw-r--r-- | tests/test-sflow.c | 120 | ||||
| -rw-r--r-- | tests/tunnel.at | 26 |
31 files changed, 1454 insertions, 1454 deletions
diff --git a/tests/bfd.at b/tests/bfd.at index 97da74217..7af7be54a 100644 --- a/tests/bfd.at +++ b/tests/bfd.at @@ -846,12 +846,12 @@ check_liveness () { printf '\n\n--- check_liveness %d ---\n\n\n' $1 shift - echo >>expout "OFPT_PORT_STATUS (OF1.3): MOD: 1(p0): addr: + echo >>expout "OFPT_PORT_STATUS (OF1.3): MOD: 1(p0): addr: config: 0 state: $1 speed: 0 Mbps now, 0 Mbps max" - AT_CHECK( + AT_CHECK( [[sed ' s/ (xid=0x[0-9a-fA-F]*)// s/ *duration.*// @@ -917,12 +917,12 @@ check_liveness () { printf '\n\n--- check_liveness %d ---\n\n\n' $1 shift - echo >>expout "OFPT_PORT_STATUS (OF1.4): MOD: 1(p0): addr: + echo >>expout "OFPT_PORT_STATUS (OF1.4): MOD: 1(p0): addr: config: 0 state: $1 speed: 0 Mbps now, 0 Mbps max" - AT_CHECK( + AT_CHECK( [[sed ' s/ (xid=0x[0-9a-fA-F]*)// s/ *duration.*// @@ -988,12 +988,12 @@ check_liveness () { printf '\n\n--- check_liveness %d ---\n\n\n' $1 shift - echo >>expout "OFPT_PORT_STATUS (OF1.5): MOD: 1(p0): addr: + echo >>expout "OFPT_PORT_STATUS (OF1.5): MOD: 1(p0): addr: config: 0 state: $1 speed: 0 Mbps now, 0 Mbps max" - AT_CHECK( + AT_CHECK( [[sed ' s/ (xid=0x[0-9a-fA-F]*)// s/ *duration.*// diff --git a/tests/cfm.at b/tests/cfm.at index 8c8bd20ad..053be5d56 100644 --- a/tests/cfm.at +++ b/tests/cfm.at @@ -331,12 +331,12 @@ check_liveness () { printf '\n\n--- check_liveness %d ---\n\n\n' $1 shift - echo >>expout "OFPT_PORT_STATUS (OF1.3): MOD: 1(p0): addr: + echo >>expout "OFPT_PORT_STATUS (OF1.3): MOD: 1(p0): addr: config: 0 state: $1 speed: 0 Mbps now, 0 Mbps max" - AT_CHECK( + AT_CHECK( [[sed ' s/ (xid=0x[0-9a-fA-F]*)// s/ *duration.*// @@ -393,12 +393,12 @@ check_liveness () { printf '\n\n--- check_liveness %d ---\n\n\n' $1 shift - echo >>expout "OFPT_PORT_STATUS (OF1.4): MOD: 1(p0): addr: + echo >>expout "OFPT_PORT_STATUS (OF1.4): MOD: 1(p0): addr: config: 0 state: $1 speed: 0 Mbps now, 0 Mbps max" - AT_CHECK( + AT_CHECK( [[sed ' s/ (xid=0x[0-9a-fA-F]*)// s/ *duration.*// @@ -455,12 +455,12 @@ check_liveness () { printf '\n\n--- check_liveness %d ---\n\n\n' $1 shift - echo >>expout "OFPT_PORT_STATUS (OF1.5): MOD: 1(p0): addr: + echo >>expout "OFPT_PORT_STATUS (OF1.5): MOD: 1(p0): addr: config: 0 state: $1 speed: 0 Mbps now, 0 Mbps max" - AT_CHECK( + AT_CHECK( [[sed ' s/ (xid=0x[0-9a-fA-F]*)// s/ *duration.*// diff --git a/tests/classifier.at b/tests/classifier.at index 2362948e3..86f872db6 100644 --- a/tests/classifier.at +++ b/tests/classifier.at @@ -278,7 +278,7 @@ for src in 0 1 2 3; do [[12]][[123]]) out=1 ;; 32) out=2 ;; [[13]][[234]]) out=3 ;; - ?1) out=4 ;; + ?1) out=4 ;; 15) out=5 ;; *) out=6 esac diff --git a/tests/dpif-netdev.at b/tests/dpif-netdev.at index c6f6a6695..fff395d56 100644 --- a/tests/dpif-netdev.at +++ b/tests/dpif-netdev.at @@ -36,8 +36,8 @@ filter_flow_install () { filter_flow_dump () { grep 'flow_dump ' | sed ' - s/.*flow_dump // - s/used:[0-9]*\.[0-9]*/used:0.0/ + s/.*flow_dump // + s/used:[0-9]*\.[0-9]*/used:0.0/ ' | sort | uniq } diff --git a/tests/interface-reconfigure.at b/tests/interface-reconfigure.at index f3914a4f4..035b00956 100644 --- a/tests/interface-reconfigure.at +++ b/tests/interface-reconfigure.at @@ -60,10 +60,10 @@ while test ${#} -ge 4; do test X"${2}" = Xinterface && \ test X"${4}" = Xofport; then if test X"${3}" = Xeth2; then - echo 5 - else - echo -1 - fi + echo 5 + else + echo -1 + fi fi shift @@ -109,566 +109,566 @@ EOF cat > var/xapi/network.dbcache <<'EOF' <?xml version="1.0" ?> <xenserver-network-configuration> - <pif ref="OpaqueRef:e0955887-571f-17fc-a971-61c1ec7d81b6"> - <VLAN_slave_of/> + <pif ref="OpaqueRef:e0955887-571f-17fc-a971-61c1ec7d81b6"> + <VLAN_slave_of/> <tunnel_access_PIF_of/> - <management> - False - </management> - <bond_slave_of> - OpaqueRef:86d81bcf-0d25-90b2-cb11-af2007bd586e - </bond_slave_of> - <uuid> - bd62a141-091f-3909-e334-0334f67ff3be - </uuid> - <IP> - - </IP> - <VLAN_master_of> - OpaqueRef:NULL - </VLAN_master_of> - <VLAN> - -1 - </VLAN> - <netmask> - - </netmask> - <other_config/> - <MAC> - 00:22:19:22:4b:af - </MAC> - <ip_configuration_mode> - None - </ip_configuration_mode> - <DNS> - - </DNS> - <device> - eth0 - </device> - <bond_master_of/> - <currently_attached> - False - </currently_attached> - <gateway> - - </gateway> - <network> - OpaqueRef:83e4a934-aeb5-e6f0-a743-d1c7ef7364c5 - </network> - </pif> - <pif ref="OpaqueRef:eea8da94-a5e6-18fc-34a7-5e9b5a235806"> - <VLAN_slave_of/> + <management> + False + </management> + <bond_slave_of> + OpaqueRef:86d81bcf-0d25-90b2-cb11-af2007bd586e + </bond_slave_of> + <uuid> + bd62a141-091f-3909-e334-0334f67ff3be + </uuid> + <IP> + + </IP> + <VLAN_master_of> + OpaqueRef:NULL + </VLAN_master_of> + <VLAN> + -1 + </VLAN> + <netmask> + + </netmask> + <other_config/> + <MAC> + 00:22:19:22:4b:af + </MAC> + <ip_configuration_mode> + None + </ip_configuration_mode> + <DNS> + + </DNS> + <device> + eth0 + </device> + <bond_master_of/> + <currently_attached> + False + </currently_attached> + <gateway> + + </gateway> + <network> + OpaqueRef:83e4a934-aeb5-e6f0-a743-d1c7ef7364c5 + </network> + </pif> + <pif ref="OpaqueRef:eea8da94-a5e6-18fc-34a7-5e9b5a235806"> + <VLAN_slave_of/> <tunnel_access_PIF_of/> - <management> - False - </management> - <bond_slave_of> - OpaqueRef:NULL - </bond_slave_of> - <uuid> - df8d35c2-cc3a-a623-7065-d987a29feb75 - </uuid> - <IP> - - </IP> - <VLAN_master_of> - OpaqueRef:NULL - </VLAN_master_of> - <VLAN> - -1 - </VLAN> - <netmask> - - </netmask> - <other_config/> - <MAC> - 00:1b:21:29:ce:51 - </MAC> - <ip_configuration_mode> - None - </ip_configuration_mode> - <DNS> - - </DNS> - <device> - eth4 - </device> - <bond_master_of/> - <currently_attached> - False - </currently_attached> - <gateway> - - </gateway> - <network> - OpaqueRef:bf51b4d3-7bdc-ea55-ba21-539b150b0531 - </network> - </pif> - <pif ref="OpaqueRef:2956e6c8-487e-981c-85ff-c84796418768"> - <VLAN_slave_of/> + <management> + False + </management> + <bond_slave_of> + OpaqueRef:NULL + </bond_slave_of> + <uuid> + df8d35c2-cc3a-a623-7065-d987a29feb75 + </uuid> + <IP> + + </IP> + <VLAN_master_of> + OpaqueRef:NULL + </VLAN_master_of> + <VLAN> + -1 + </VLAN> + <netmask> + + </netmask> + <other_config/> + <MAC> + 00:1b:21:29:ce:51 + </MAC> + <ip_configuration_mode> + None + </ip_configuration_mode> + <DNS> + + </DNS> + <device> + eth4 + </device> + <bond_master_of/> + <currently_attached> + False + </currently_attached> + <gateway> + + </gateway> + <network> + OpaqueRef:bf51b4d3-7bdc-ea55-ba21-539b150b0531 + </network> + </pif> + <pif ref="OpaqueRef:2956e6c8-487e-981c-85ff-c84796418768"> + <VLAN_slave_of/> <tunnel_access_PIF_of/> - <management> - False - </management> - <bond_slave_of> - OpaqueRef:86d81bcf-0d25-90b2-cb11-af2007bd586e - </bond_slave_of> - <uuid> - 2f87fc95-5ab4-571a-2487-3f4ac1985663 - </uuid> - <IP> - - </IP> - <VLAN_master_of> - OpaqueRef:NULL - </VLAN_master_of> - <VLAN> - -1 - </VLAN> - <netmask> - - </netmask> - <other_config/> - <MAC> - 00:22:19:22:4b:b1 - </MAC> - <ip_configuration_mode> - None - </ip_configuration_mode> - <DNS> - - </DNS> - <device> - eth1 - </device> - <bond_master_of/> - <currently_attached> - False - </currently_attached> - <gateway> - - </gateway> - <network> - OpaqueRef:92b41bf6-aa21-45d3-1c86-c87a5fa98f7d - </network> - </pif> - <pif ref="OpaqueRef:d2d1e51e-4da9-3163-8f57-bb683429335e"> - <VLAN_slave_of/> + <management> + False + </management> + <bond_slave_of> + OpaqueRef:86d81bcf-0d25-90b2-cb11-af2007bd586e + </bond_slave_of> + <uuid> + 2f87fc95-5ab4-571a-2487-3f4ac1985663 + </uuid> + <IP> + + </IP> + <VLAN_master_of> + OpaqueRef:NULL + </VLAN_master_of> + <VLAN> + -1 + </VLAN> + <netmask> + + </netmask> + <other_config/> + <MAC> + 00:22:19:22:4b:b1 + </MAC> + <ip_configuration_mode> + None + </ip_configuration_mode> + <DNS> + + </DNS> + <device> + eth1 + </device> + <bond_master_of/> + <currently_attached> + False + </currently_attached> + <gateway> + + </gateway> + <network> + OpaqueRef:92b41bf6-aa21-45d3-1c86-c87a5fa98f7d + </network> + </pif> + <pif ref="OpaqueRef:d2d1e51e-4da9-3163-8f57-bb683429335e"> + <VLAN_slave_of/> <tunnel_access_PIF_of/> - <management> - False - </management> - <bond_slave_of> - OpaqueRef:NULL - </bond_slave_of> - <uuid> - d2dfdab3-daf4-afea-f055-a25a0d24d714 - </uuid> - <IP> - - </IP> - <VLAN_master_of> - OpaqueRef:4c0eb823-4d96-da1d-e75f-411b85badb0c - </VLAN_master_of> - <VLAN> - 4 - </VLAN> - <netmask> - - </netmask> - <other_config/> - <MAC> - fe:ff:ff:ff:ff:ff - </MAC> - <ip_configuration_mode> - None - </ip_configuration_mode> - <DNS> - - </DNS> - <device> - bond0 - </device> - <bond_master_of/> - <currently_attached> - True - </currently_attached> - <gateway> - - </gateway> - <network> - OpaqueRef:a63afad0-fb4c-b4a4-3696-cbb3d88afc47 - </network> - </pif> - <pif ref="OpaqueRef:2bc0fab5-523a-4125-609d-212391f5f6fc"> - <VLAN_slave_of> - <master> - OpaqueRef:e623e1d6-cd02-be8d-820d-49d65c710297 - </master> - </VLAN_slave_of> + <management> + False + </management> + <bond_slave_of> + OpaqueRef:NULL + </bond_slave_of> + <uuid> + d2dfdab3-daf4-afea-f055-a25a0d24d714 + </uuid> + <IP> + + </IP> + <VLAN_master_of> + OpaqueRef:4c0eb823-4d96-da1d-e75f-411b85badb0c + </VLAN_master_of> + <VLAN> + 4 + </VLAN> + <netmask> + + </netmask> + <other_config/> + <MAC> + fe:ff:ff:ff:ff:ff + </MAC> + <ip_configuration_mode> + None + </ip_configuration_mode> + <DNS> + + </DNS> + <device> + bond0 + </device> + <bond_master_of/> + <currently_attached> + True + </currently_attached> + <gateway> + + </gateway> + <network> + OpaqueRef:a63afad0-fb4c-b4a4-3696-cbb3d88afc47 + </network> + </pif> + <pif ref="OpaqueRef:2bc0fab5-523a-4125-609d-212391f5f6fc"> + <VLAN_slave_of> + <master> + OpaqueRef:e623e1d6-cd02-be8d-820d-49d65c710297 + </master> + </VLAN_slave_of> <tunnel_access_PIF_of/> - <management> - False - </management> - <bond_slave_of> - OpaqueRef:NULL - </bond_slave_of> - <uuid> - f4ba396e-a993-a592-5fbc-a1d566afb59e - </uuid> - <IP> - 10.0.0.188 - </IP> - <VLAN_master_of> - OpaqueRef:NULL - </VLAN_master_of> - <VLAN> - -1 - </VLAN> - <netmask> - 255.0.0.0 - </netmask> - <other_config/> - <MAC> - 00:15:17:a0:29:81 - </MAC> - <ip_configuration_mode> - Static - </ip_configuration_mode> - <DNS> - - </DNS> - <device> - eth3 - </device> - <bond_master_of/> - <currently_attached> - True - </currently_attached> - <gateway> - - </gateway> - <network> - OpaqueRef:d9189da2-d00b-61ba-8a6d-ac42cc868e32 - </network> - </pif> - <pif ref="OpaqueRef:205d1186-2cd1-d5e6-45e4-ea1698ea6e15"> - <VLAN_slave_of/> + <management> + False + </management> + <bond_slave_of> + OpaqueRef:NULL + </bond_slave_of> + <uuid> + f4ba396e-a993-a592-5fbc-a1d566afb59e + </uuid> + <IP> + 10.0.0.188 + </IP> + <VLAN_master_of> + OpaqueRef:NULL + </VLAN_master_of> + <VLAN> + -1 + </VLAN> + <netmask> + 255.0.0.0 + </netmask> + <other_config/> + <MAC> + 00:15:17:a0:29:81 + </MAC> + <ip_configuration_mode> + Static + </ip_configuration_mode> + <DNS> + + </DNS> + <device> + eth3 + </device> + <bond_master_of/> + <currently_attached> + True + </currently_attached> + <gateway> + + </gateway> + <network> + OpaqueRef:d9189da2-d00b-61ba-8a6d-ac42cc868e32 + </network> + </pif> + <pif ref="OpaqueRef:205d1186-2cd1-d5e6-45e4-ea1698ea6e15"> + <VLAN_slave_of/> <tunnel_access_PIF_of/> - <management> - True - </management> - <bond_slave_of> - OpaqueRef:NULL - </bond_slave_of> - <uuid> - 646ca9a1-36ad-e2f9-3ecc-1e5622c201c2 - </uuid> - <IP> - 172.18.3.188 - </IP> - <VLAN_master_of> - OpaqueRef:NULL - </VLAN_master_of> - <VLAN> - -1 - </VLAN> - <netmask> - 255.255.0.0 - </netmask> - <other_config/> - <MAC> - 00:15:17:a0:29:80 - </MAC> - <ip_configuration_mode> - DHCP - </ip_configuration_mode> - <DNS> - - </DNS> - <device> - eth2 - </device> - <bond_master_of/> - <currently_attached> - True - </currently_attached> - <gateway> - - </gateway> - <network> - OpaqueRef:6e7c6e81-6b5e-b91f-e1f9-9e028567bdfe - </network> - </pif> - <pif ref="OpaqueRef:8e3e37e6-ebb9-087e-0201-f6a56bf554c3"> - <VLAN_slave_of/> + <management> + True + </management> + <bond_slave_of> + OpaqueRef:NULL + </bond_slave_of> + <uuid> + 646ca9a1-36ad-e2f9-3ecc-1e5622c201c2 + </uuid> + <IP> + 172.18.3.188 + </IP> + <VLAN_master_of> + OpaqueRef:NULL + </VLAN_master_of> + <VLAN> + -1 + </VLAN> + <netmask> + 255.255.0.0 + </netmask> + <other_config/> + <MAC> + 00:15:17:a0:29:80 + </MAC> + <ip_configuration_mode> + DHCP + </ip_configuration_mode> + <DNS> + + </DNS> + <device> + eth2 + </device> + <bond_master_of/> + <currently_attached> + True + </currently_attached> + <gateway> + + </gateway> + <network> + OpaqueRef:6e7c6e81-6b5e-b91f-e1f9-9e028567bdfe + </network> + </pif> + <pif ref="OpaqueRef:8e3e37e6-ebb9-087e-0201-f6a56bf554c3"> + <VLAN_slave_of/> <tunnel_access_PIF_of/> - <management> - False - </management> - <bond_slave_of> - OpaqueRef:NULL - </bond_slave_of> - <uuid> - 3941edd2-865b-8dd8-61f0-199f5e1fa652 - </uuid> - <IP> - - </IP> - <VLAN_master_of> - OpaqueRef:e623e1d6-cd02-be8d-820d-49d65c710297 - </VLAN_master_of> - <VLAN> - 123 - </VLAN> - <netmask> - - </netmask> - <other_config/> - <MAC> - fe:ff:ff:ff:ff:ff - </MAC> - <ip_configuration_mode> - None - </ip_configuration_mode> - <DNS> - - </DNS> - <device> - eth3 - </device> - <bond_master_of/> - <currently_attached> - True - </currently_attached> - <gateway> - - </gateway> - <network> - OpaqueRef:240fb5f8-addc-6ea3-f921-2a42b42acd17 - </network> - </pif> - <pif ref="OpaqueRef:69c904bb-8da9-3424-485b-8b47c2d3ef11"> - <VLAN_slave_of> - <master> - OpaqueRef:4c0eb823-4d96-da1d-e75f-411b85badb0c - </master> - </VLAN_slave_of> + <management> + False + </management> + <bond_slave_of> + OpaqueRef:NULL + </bond_slave_of> + <uuid> + 3941edd2-865b-8dd8-61f0-199f5e1fa652 + </uuid> + <IP> + + </IP> + <VLAN_master_of> + OpaqueRef:e623e1d6-cd02-be8d-820d-49d65c710297 + </VLAN_master_of> + <VLAN> + 123 + </VLAN> + <netmask> + + </netmask> + <other_config/> + <MAC> + fe:ff:ff:ff:ff:ff + </MAC> + <ip_configuration_mode> + None + </ip_configuration_mode> + <DNS> + + </DNS> + <device> + eth3 + </device> + <bond_master_of/> + <currently_attached> + True + </currently_attached> + <gateway> + + </gateway> + <network> + OpaqueRef:240fb5f8-addc-6ea3-f921-2a42b42acd17 + </network> + </pif> + <pif ref="OpaqueRef:69c904bb-8da9-3424-485b-8b47c2d3ef11"> + <VLAN_slave_of> + <master> + OpaqueRef:4c0eb823-4d96-da1d-e75f-411b85badb0c + </master> + </VLAN_slave_of> <tunnel_access_PIF_of/> - <management> - False - </management> - <bond_slave_of> - OpaqueRef:NULL - </bond_slave_of> - <uuid> - 6c0327a9-afa3-fc19-6798-a1bfe20095ed - </uuid> - <IP> - - </IP> - <VLAN_master_of> - OpaqueRef:NULL - </VLAN_master_of> - <VLAN> - -1 - </VLAN> - <netmask> - - </netmask> - <other_config/> - <MAC> - 00:22:19:22:4b:af - </MAC> - <ip_configuration_mode> - None - </ip_configuration_mode> - <DNS> - - </DNS> - <device> - bond0 - </device> - <bond_master_of> - <slave> - OpaqueRef:86d81bcf-0d25-90b2-cb11-af2007bd586e - </slave> - </bond_master_of> - <currently_attached> - True - </currently_attached> - <gateway> - - </gateway> - <network> - OpaqueRef:ec1e5037-60ea-97e5-54b8-39bdb43c071a - </network> - </pif> - <bond ref="OpaqueRef:86d81bcf-0d25-90b2-cb11-af2007bd586e"> - <master> - OpaqueRef:69c904bb-8da9-3424-485b-8b47c2d3ef11 - </master> - <uuid> - dad825f1-6d81-386e-849c-5589281e53e1 - </uuid> - <slaves> - <slave> - OpaqueRef:e0955887-571f-17fc-a971-61c1ec7d81b6 - </slave> - <slave> - OpaqueRef:2956e6c8-487e-981c-85ff-c84796418768 - </slave> - </slaves> - </bond> - <vlan ref="OpaqueRef:4c0eb823-4d96-da1d-e75f-411b85badb0c"> - <tagged_PIF> - OpaqueRef:69c904bb-8da9-3424-485b-8b47c2d3ef11 - </tagged_PIF> - <uuid> - 841814da-d0d2-9da4-0b2e-b6143480bbfb - </uuid> - <untagged_PIF> - OpaqueRef:d2d1e51e-4da9-3163-8f57-bb683429335e - </untagged_PIF> - </vlan> - <vlan ref="OpaqueRef:e623e1d6-cd02-be8d-820d-49d65c710297"> - <tagged_PIF> - OpaqueRef:2bc0fab5-523a-4125-609d-212391f5f6fc - </tagged_PIF> - <uuid> - 399279a2-5ccd-5368-9af3-8622a1f1ac82 - </uuid> - <untagged_PIF> - OpaqueRef:8e3e37e6-ebb9-087e-0201-f6a56bf554c3 - </untagged_PIF> - </vlan> - <network ref="OpaqueRef:a63afad0-fb4c-b4a4-3696-cbb3d88afc47"> - <PIFs> - <PIF> - OpaqueRef:d2d1e51e-4da9-3163-8f57-bb683429335e - </PIF> - </PIFs> - <bridge> - xapi2 - </bridge> - <other_config/> - <uuid> - 99be2da4-6c33-6f8e-49ea-3bc592fe3c85 - </uuid> - </network> - <network ref="OpaqueRef:d9189da2-d00b-61ba-8a6d-ac42cc868e32"> - <PIFs> - <PIF> - OpaqueRef:2bc0fab5-523a-4125-609d-212391f5f6fc - </PIF> - </PIFs> - <bridge> - xenbr3 - </bridge> - <other_config/> - <uuid> - 2902ae1b-8013-897a-b697-0b200ea3aaa5 - </uuid> - </network> - <network ref="OpaqueRef:ec1e5037-60ea-97e5-54b8-39bdb43c071a"> - <PIFs> - <PIF> - OpaqueRef:69c904bb-8da9-3424-485b-8b47c2d3ef11 - </PIF> - </PIFs> - <bridge> - xapi1 - </bridge> - <other_config/> - <uuid> - 45cbbb43-113d-a712-3231-c6463f253cef - </uuid> - </network> - <network ref="OpaqueRef:92b41bf6-aa21-45d3-1c86-c87a5fa98f7d"> - <PIFs> - <PIF> - OpaqueRef:2956e6c8-487e-981c-85ff-c84796418768 - </PIF> - </PIFs> - <bridge> - xenbr1 - </bridge> - <other_config/> - <uuid> - 99f8771a-645a-26a3-e06c-30a401f1d009 - </uuid> - </network> - <network ref="OpaqueRef:6e7c6e81-6b5e-b91f-e1f9-9e028567bdfe"> - <PIFs> - <PIF> - OpaqueRef:205d1186-2cd1-d5e6-45e4-ea1698ea6e15 - </PIF> - </PIFs> - <bridge> - xenbr2 - </bridge> - <other_config/> - <uuid> - d08c8749-0c8f-9e8d-ce25-fd364661ee99 - </uuid> - </network> - <network ref="OpaqueRef:83e4a934-aeb5-e6f0-a743-d1c7ef7364c5"> - <PIFs> - <PIF> - OpaqueRef:e0955887-571f-17fc-a971-61c1ec7d81b6 - </PIF> - </PIFs> - <bridge> - xenbr0 - </bridge> - <other_config> - <vswitch-disable-in-band> - true - </vswitch-disable-in-band> - </other_config> - <uuid> - c9eecb03-560d-61de-b6a8-56dfc766f67e - </uuid> - </network> - <network ref="OpaqueRef:bf51b4d3-7bdc-ea55-ba21-539b150b0531"> - <PIFs> - <PIF> - OpaqueRef:eea8da94-a5e6-18fc-34a7-5e9b5a235806 - </PIF> - </PIFs> - <bridge> - xenbr4 - </bridge> - <other_config/> - <uuid> - d2c14c89-29cc-51d4-7664-633eff02b2ad - </uuid> - </network> - <network ref="OpaqueRef:0b7354a4-8f4b-aa08-2f16-a22c117e4211"> - <PIFs/> - <bridge> - xapi0 - </bridge> - <other_config/> - <uuid> - dc0f0632-c2aa-1b78-2fea-0d3a23c51740 - </uuid> - </network> - <network ref="OpaqueRef:240fb5f8-addc-6ea3-f921-2a42b42acd17"> - <PIFs> - <PIF> - OpaqueRef:8e3e37e6-ebb9-087e-0201-f6a56bf554c3 - </PIF> - </PIFs> - <bridge> - xapi3 - </bridge> - <other_config/> - <uuid> - db7bdc03-074d-42ae-fc73-9b06de1d57f6 - </uuid> - </network> + <management> + False + </management> + <bond_slave_of> + OpaqueRef:NULL + </bond_slave_of> + <uuid> + 6c0327a9-afa3-fc19-6798-a1bfe20095ed + </uuid> + <IP> + + </IP> + <VLAN_master_of> + OpaqueRef:NULL + </VLAN_master_of> + <VLAN> + -1 + </VLAN> + <netmask> + + </netmask> + <other_config/> + <MAC> + 00:22:19:22:4b:af + </MAC> + <ip_configuration_mode> + None + </ip_configuration_mode> + <DNS> + + </DNS> + <device> + bond0 + </device> + <bond_master_of> + <slave> + OpaqueRef:86d81bcf-0d25-90b2-cb11-af2007bd586e + </slave> + </bond_master_of> + <currently_attached> + True + </currently_attached> + <gateway> + + </gateway> + <network> + OpaqueRef:ec1e5037-60ea-97e5-54b8-39bdb43c071a + </network> + </pif> + <bond ref="OpaqueRef:86d81bcf-0d25-90b2-cb11-af2007bd586e"> + <master> + OpaqueRef:69c904bb-8da9-3424-485b-8b47c2d3ef11 + </master> + <uuid> + dad825f1-6d81-386e-849c-5589281e53e1 + </uuid> + <slaves> + <slave> + OpaqueRef:e0955887-571f-17fc-a971-61c1ec7d81b6 + </slave> + <slave> + OpaqueRef:2956e6c8-487e-981c-85ff-c84796418768 + </slave> + </slaves> + </bond> + <vlan ref="OpaqueRef:4c0eb823-4d96-da1d-e75f-411b85badb0c"> + <tagged_PIF> + OpaqueRef:69c904bb-8da9-3424-485b-8b47c2d3ef11 + </tagged_PIF> + <uuid> + 841814da-d0d2-9da4-0b2e-b6143480bbfb + </uuid> + <untagged_PIF> + OpaqueRef:d2d1e51e-4da9-3163-8f57-bb683429335e + </untagged_PIF> + </vlan> + <vlan ref="OpaqueRef:e623e1d6-cd02-be8d-820d-49d65c710297"> + <tagged_PIF> + OpaqueRef:2bc0fab5-523a-4125-609d-212391f5f6fc + </tagged_PIF> + <uuid> + 399279a2-5ccd-5368-9af3-8622a1f1ac82 + </uuid> + <untagged_PIF> + OpaqueRef:8e3e37e6-ebb9-087e-0201-f6a56bf554c3 + </untagged_PIF> + </vlan> + <network ref="OpaqueRef:a63afad0-fb4c-b4a4-3696-cbb3d88afc47"> + <PIFs> + <PIF> + OpaqueRef:d2d1e51e-4da9-3163-8f57-bb683429335e + </PIF> + </PIFs> + <bridge> + xapi2 + </bridge> + <other_config/> + <uuid> + 99be2da4-6c33-6f8e-49ea-3bc592fe3c85 + </uuid> + </network> + <network ref="OpaqueRef:d9189da2-d00b-61ba-8a6d-ac42cc868e32"> + <PIFs> + <PIF> + OpaqueRef:2bc0fab5-523a-4125-609d-212391f5f6fc + </PIF> + </PIFs> + <bridge> + xenbr3 + </bridge> + <other_config/> + <uuid> + 2902ae1b-8013-897a-b697-0b200ea3aaa5 + </uuid> + </network> + <network ref="OpaqueRef:ec1e5037-60ea-97e5-54b8-39bdb43c071a"> + <PIFs> + <PIF> + OpaqueRef:69c904bb-8da9-3424-485b-8b47c2d3ef11 + </PIF> + </PIFs> + <bridge> + xapi1 + </bridge> + <other_config/> + <uuid> + 45cbbb43-113d-a712-3231-c6463f253cef + </uuid> + </network> + <network ref="OpaqueRef:92b41bf6-aa21-45d3-1c86-c87a5fa98f7d"> + <PIFs> + <PIF> + OpaqueRef:2956e6c8-487e-981c-85ff-c84796418768 + </PIF> + </PIFs> + <bridge> + xenbr1 + </bridge> + <other_config/> + <uuid> + 99f8771a-645a-26a3-e06c-30a401f1d009 + </uuid> + </network> + <network ref="OpaqueRef:6e7c6e81-6b5e-b91f-e1f9-9e028567bdfe"> + <PIFs> + <PIF> + OpaqueRef:205d1186-2cd1-d5e6-45e4-ea1698ea6e15 + </PIF> + </PIFs> + <bridge> + xenbr2 + </bridge> + <other_config/> + <uuid> + d08c8749-0c8f-9e8d-ce25-fd364661ee99 + </uuid> + </network> + <network ref="OpaqueRef:83e4a934-aeb5-e6f0-a743-d1c7ef7364c5"> + <PIFs> + <PIF> + OpaqueRef:e0955887-571f-17fc-a971-61c1ec7d81b6 + </PIF> + </PIFs> + <bridge> + xenbr0 + </bridge> + <other_config> + <vswitch-disable-in-band> + true + </vswitch-disable-in-band> + </other_config> + <uuid> + c9eecb03-560d-61de-b6a8-56dfc766f67e + </uuid> + </network> + <network ref="OpaqueRef:bf51b4d3-7bdc-ea55-ba21-539b150b0531"> + <PIFs> + <PIF> + OpaqueRef:eea8da94-a5e6-18fc-34a7-5e9b5a235806 + </PIF> + </PIFs> + <bridge> + xenbr4 + </bridge> + <other_config/> + <uuid> + d2c14c89-29cc-51d4-7664-633eff02b2ad + </uuid> + </network> + <network ref="OpaqueRef:0b7354a4-8f4b-aa08-2f16-a22c117e4211"> + <PIFs/> + <bridge> + xapi0 + </bridge> + <other_config/> + <uuid> + dc0f0632-c2aa-1b78-2fea-0d3a23c51740 + </uuid> + </network> + <network ref="OpaqueRef:240fb5f8-addc-6ea3-f921-2a42b42acd17"> + <PIFs> + <PIF> + OpaqueRef:8e3e37e6-ebb9-087e-0201-f6a56bf554c3 + </PIF> + </PIFs> + <bridge> + xapi3 + </bridge> + <other_config/> + <uuid> + db7bdc03-074d-42ae-fc73-9b06de1d57f6 + </uuid> + </network> <pool ref="OpaqueRef:a765d06c-fc82-cc67-8f6c-fd8db45f6a84"> <other_config> <vswitch-controller-fail-mode> diff --git a/tests/lacp.at b/tests/lacp.at index ee8100858..a7f75ac67 100644 --- a/tests/lacp.at +++ b/tests/lacp.at @@ -735,12 +735,12 @@ check_liveness () { printf '\n\n--- check_liveness %d ---\n\n\n' $1 shift - echo >>expout "OFPT_PORT_STATUS (OF1.3): MOD: 1(p0): addr: + echo >>expout "OFPT_PORT_STATUS (OF1.3): MOD: 1(p0): addr: config: 0 state: $1 speed: 0 Mbps now, 0 Mbps max" - AT_CHECK( + AT_CHECK( [[sed ' s/ (xid=0x[0-9a-fA-F]*)// s/ *duration.*// @@ -831,12 +831,12 @@ check_liveness () { printf '\n\n--- check_liveness %d ---\n\n\n' $1 shift - echo >>expout "OFPT_PORT_STATUS (OF1.4): MOD: 1(p0): addr: + echo >>expout "OFPT_PORT_STATUS (OF1.4): MOD: 1(p0): addr: config: 0 state: $1 speed: 0 Mbps now, 0 Mbps max" - AT_CHECK( + AT_CHECK( [[sed ' s/ (xid=0x[0-9a-fA-F]*)// s/ *duration.*// @@ -927,12 +927,12 @@ check_liveness () { printf '\n\n--- check_liveness %d ---\n\n\n' $1 shift - echo >>expout "OFPT_PORT_STATUS (OF1.5): MOD: 1(p0): addr: + echo >>expout "OFPT_PORT_STATUS (OF1.5): MOD: 1(p0): addr: config: 0 state: $1 speed: 0 Mbps now, 0 Mbps max" - AT_CHECK( + AT_CHECK( [[sed ' s/ (xid=0x[0-9a-fA-F]*)// s/ *duration.*// diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 50e827e8e..d7989259b 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -2537,8 +2537,8 @@ AT_CHECK([ovs-appctl time/warp 5000], [0], [ignore]) dnl Modified MPLS pop action. dnl The input is a frame with two MPLS label stack entries which tcpdump -vve shows as: dnl 60:66:66:66:01:00 > 50:54:00:00:00:07, ethertype MPLS multicast (0x8848), length 66: MPLS (label 20, exp 0, ttl 32) -dnl (label 20, exp 0, [S], ttl 31) -dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) +dnl (label 20, exp 0, [S], ttl 31) +dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) dnl 192.168.0.1.80 > 192.168.0.2.0: Flags [none], cksum 0x7744 (correct), seq 42:46, win 10000, length 4 AT_CHECK([ovs-ofctl monitor br0 65534 -P nxt_packet_in --detach --pidfile 2> ofctl_monitor.log]) @@ -2564,8 +2564,8 @@ AT_CHECK([ovs-appctl time/warp 5000], [0], [ignore]) dnl Modified MPLS pop action. dnl The input is a frame with two MPLS label stack entries which tcpdump -vve shows as: dnl 60:66:66:66:01:01 > 50:54:00:00:00:07, ethertype MPLS unicast (0x8847), length 66: MPLS (label 20, exp 0, ttl 32) -dnl (label 20, exp 0, [S], ttl 31) -dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) +dnl (label 20, exp 0, [S], ttl 31) +dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) dnl 192.168.0.1.80 > 192.168.0.2.0: Flags [none], cksum 0x7744 (correct), seq 42:46, win 10000, length 4 AT_CHECK([ovs-ofctl monitor br0 65534 -P nxt_packet_in --detach --pidfile 2> ofctl_monitor.log]) @@ -2591,8 +2591,8 @@ AT_CHECK([ovs-appctl time/warp 5000], [0], [ignore]) dnl Modified MPLS pop action. dnl The input is a frame with two MPLS label stack entries which tcpdump -vve shows as: dnl 60:66:66:66:01:02 > 50:54:00:00:00:07, ethertype MPLS multicast (0x8848), length 66: MPLS (label 20, exp 0, ttl 32) -dnl (label 20, exp 0, [S], ttl 31) -dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) +dnl (label 20, exp 0, [S], ttl 31) +dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) dnl 192.168.0.1.80 > 192.168.0.2.0: Flags [none], cksum 0x7744 (correct), seq 42:46, win 10000, length 4 AT_CHECK([ovs-ofctl monitor br0 65534 -P nxt_packet_in --detach --pidfile 2> ofctl_monitor.log]) @@ -2618,8 +2618,8 @@ AT_CHECK([ovs-appctl time/warp 5000], [0], [ignore]) dnl Modified MPLS pop action. dnl The input is a frame with two MPLS label stack entries which tcpdump -vve shows as: dnl 60:66:66:66:02:00 > 50:54:00:00:02:00, ethertype MPLS unicast (0x8847), length 66: MPLS (label 20, exp 0, ttl 32) -dnl (label 20, exp 0, [S], ttl 31) -dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) +dnl (label 20, exp 0, [S], ttl 31) +dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) dnl 192.168.0.1.80 > 192.168.0.2.0: Flags [none], cksum 0x7744 (correct), seq 42:46, win 10000, length 4 AT_CHECK([ovs-ofctl monitor br0 65534 -P nxt_packet_in --detach --pidfile 2> ofctl_monitor.log]) @@ -2645,8 +2645,8 @@ AT_CHECK([ovs-appctl time/warp 5000], [0], [ignore]) dnl Modified MPLS pop action. dnl The input is a frame with two MPLS label stack entries which tcpdump -vve shows as: dnl 60:66:66:66:02:01 > 50:54:00:00:02:01, ethertype MPLS multicast (0x8848), length 66: MPLS (label 20, exp 0, ttl 32) -dnl (label 20, exp 0, [S], ttl 31) -dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) +dnl (label 20, exp 0, [S], ttl 31) +dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) dnl 192.168.0.1.80 > 192.168.0.2.0: Flags [none], cksum 0x7744 (correct), seq 42:46, win 10000, length 4 AT_CHECK([ovs-ofctl monitor br0 65534 -P nxt_packet_in --detach --pidfile 2> ofctl_monitor.log]) @@ -2673,8 +2673,8 @@ AT_CHECK([ovs-appctl time/warp 5000], [0], [ignore]) dnl Modified MPLS pop action. dnl The input is a frame with two MPLS label stack entries which tcpdump -vve shows as: dnl 60:66:66:66:02:10 > 50:54:00:00:00:07, ethertype MPLS unicast (0x8847), length 66: MPLS (label 20, exp 0, ttl 32) -dnl (label 20, exp 0, [S], ttl 31) -dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) +dnl (label 20, exp 0, [S], ttl 31) +dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) dnl 192.168.0.1.80 > 192.168.0.2.0: Flags [none], cksum 0x7744 (correct), seq 42:46, win 10000, length 4 AT_CHECK([ovs-ofctl monitor br0 65534 -P nxt_packet_in --detach --pidfile 2> ofctl_monitor.log]) @@ -2700,9 +2700,9 @@ AT_CHECK([ovs-appctl time/warp 5000], [0], [ignore]) dnl Modified MPLS pop action. dnl The input is a frame with three MPLS label stack entries which tcpdump -vve shows as: dnl 60:66:66:66:03:00 > 50:54:00:00:00:07, ethertype MPLS unicast (0x8847), length 66: MPLS (label 20, exp 0, ttl 32) -dnl (label 20, exp 0, ttl 31) -dnl (label 20, exp 0, [S], ttl 30) -dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) +dnl (label 20, exp 0, ttl 31) +dnl (label 20, exp 0, [S], ttl 30) +dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) dnl 192.168.0.1.80 > 192.168.0.2.0: Flags [none], cksum 0x7744 (correct), seq 42:46, win 10000, length 4 AT_CHECK([ovs-ofctl monitor br0 65534 -P nxt_packet_in --detach --pidfile 2> ofctl_monitor.log]) @@ -2728,9 +2728,9 @@ AT_CHECK([ovs-appctl time/warp 5000], [0], [ignore]) dnl Modified MPLS pop action. dnl The input is a frame with three MPLS label stack entries which tcpdump -vve shows as: dnl 60:66:66:66:03:01 > 50:54:00:00:00:00, ethertype MPLS multicast (0x8848), length 66: MPLS (label 20, exp 0, ttl 32) -dnl (label 20, exp 0, ttl 31) -dnl (label 20, exp 0, [S], ttl 30) -dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) +dnl (label 20, exp 0, ttl 31) +dnl (label 20, exp 0, [S], ttl 30) +dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) dnl 192.168.0.1.80 > 192.168.0.2.0: Flags [none], cksum 0x7744 (correct), seq 42:46, win 10000, length 4 AT_CHECK([ovs-ofctl monitor br0 65534 -P nxt_packet_in --detach --pidfile 2> ofctl_monitor.log]) @@ -2756,9 +2756,9 @@ AT_CHECK([ovs-appctl time/warp 5000], [0], [ignore]) dnl Modified MPLS pop action. dnl The input is a frame with three MPLS label stack entries which tcpdump -vve shows as: dnl 60:66:66:66:03:10 > 50:54:00:00:00:00, ethertype MPLS unicast (0x8847), length 66: MPLS (label 20, exp 0, ttl 32) -dnl (label 20, exp 0, ttl 31) -dnl (label 20, exp 0, [S], ttl 30) -dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) +dnl (label 20, exp 0, ttl 31) +dnl (label 20, exp 0, [S], ttl 30) +dnl (tos 0x0, ttl 254, id 0, offset 0, flags [none], proto TCP (6), length 44) dnl 192.168.0.1.80 > 192.168.0.2.0: Flags [none], cksum 0x7744 (correct), seq 42:46, win 10000, length 4 AT_CHECK([ovs-ofctl monitor br0 65534 -P nxt_packet_in --detach --pidfile 2> ofctl_monitor.log]) @@ -4771,12 +4771,12 @@ OVS_VSWITCHD_START add_of_ports br0 1 2 3 ovs-vsctl \ -- set Bridge br0 fail-mode=standalone mirrors=@m1,@m2 \ - -- --id=@m1 create Mirror name=m1 select_all=true output_vlan=500 \ - -- --id=@m2 create Mirror name=m2 select_all=true output_vlan=501 \ - -- set Port br0 tag=0 \ - -- set Port p1 tag=0 \ - -- set Port p2 tag=500 \ - -- set Port p3 tag=501 + -- --id=@m1 create Mirror name=m1 select_all=true output_vlan=500 \ + -- --id=@m2 create Mirror name=m2 select_all=true output_vlan=501 \ + -- set Port br0 tag=0 \ + -- set Port p1 tag=0 \ + -- set Port p2 tag=500 \ + -- set Port p3 tag=501 flow='in_port=1' AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout]) @@ -5993,363 +5993,363 @@ m4_define([CHECK_SFLOW_SAMPLING_PACKET], OVS_APP_EXIT_AND_WAIT([test-sflow]) AT_CHECK_UNQUOTED([[sort sflow.log | $EGREP 'HEADER|ERROR' | sed 's/ /\ - /g']], [0], [dnl + /g']], [0], [dnl HEADER - dgramSeqNo=1 - ds=127.0.0.1>2:1000 - fsSeqNo=1 - in_vlan=0 - in_priority=0 - out_vlan=0 - out_priority=0 - meanSkip=1 - samplePool=1 - dropEvents=0 - in_ifindex=1004 - in_format=0 - out_ifindex=2 - out_format=2 - hdr_prot=1 - pkt_len=46 - stripped=4 - hdr_len=42 - hdr=FF-FF-FF-FF-FF-FF-50-54-00-00-00-05-08-06-00-01-08-00-06-04-00-01-50-54-00-00-00-05-C0-A8-00-02-00-00-00-00-00-00-C0-A8-00-01 + dgramSeqNo=1 + ds=127.0.0.1>2:1000 + fsSeqNo=1 + in_vlan=0 + in_priority=0 + out_vlan=0 + out_priority=0 + meanSkip=1 + samplePool=1 + dropEvents=0 + in_ifindex=1004 + in_format=0 + out_ifindex=2 + out_format=2 + hdr_prot=1 + pkt_len=46 + stripped=4 + hdr_len=42 + hdr=FF-FF-FF-FF-FF-FF-50-54-00-00-00-05-08-06-00-01-08-00-06-04-00-01-50-54-00-00-00-05-C0-A8-00-02-00-00-00-00-00-00-C0-A8-00-01 HEADER - dgramSeqNo=1 - ds=127.0.0.1>2:1000 - fsSeqNo=2 - in_vlan=0 - in_priority=0 - out_vlan=0 - out_priority=0 - meanSkip=1 - samplePool=2 - dropEvents=0 - in_ifindex=1003 - in_format=0 - out_ifindex=2 - out_format=2 - hdr_prot=1 - pkt_len=46 - stripped=4 - hdr_len=42 - hdr=FF-FF-FF-FF-FF-FF-50-54-00-00-00-07-08-06-00-01-08-00-06-04-00-01-50-54-00-00-00-07-C0-A8-00-01-00-00-00-00-00-00-C0-A8-00-02 + dgramSeqNo=1 + ds=127.0.0.1>2:1000 + fsSeqNo=2 + in_vlan=0 + in_priority=0 + out_vlan=0 + out_priority=0 + meanSkip=1 + samplePool=2 + dropEvents=0 + in_ifindex=1003 + in_format=0 + out_ifindex=2 + out_format=2 + hdr_prot=1 + pkt_len=46 + stripped=4 + hdr_len=42 + hdr=FF-FF-FF-FF-FF-FF-50-54-00-00-00-07-08-06-00-01-08-00-06-04-00-01-50-54-00-00-00-07-C0-A8-00-01-00-00-00-00-00-00-C0-A8-00-02 HEADER - dgramSeqNo=1 - ds=127.0.0.1>2:1000 - fsSeqNo=3 - in_vlan=0 - in_priority=0 - out_vlan=0 - out_priority=0 - meanSkip=1 - samplePool=3 - dropEvents=0 - in_ifindex=1004 - in_format=0 - out_ifindex=1003 - out_format=0 - hdr_prot=1 - pkt_len=110 - stripped=4 - hdr_len=106 - hdr=50-54-00-00-00-07-50-54-00-00-00-05-08-00-45-00-00-5C-00-00-00-00-40-01-F9-4D-C0-A8-00-01-C0-A8-00-02-08-00-13-FC-00-00-00-00-00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F-10-11-12-13-14-15-16-17-18-19-1A-1B-1C-1D-1E-1F-20-21-22-23-24-25-26-27-28-29-2A-2B-2C-2D-2E-2F-30-31-32-33-34-35-36-37-38-39-3A-3B-3C-3D-3E-3F + dgramSeqNo=1 + ds=127.0.0.1>2:1000 + fsSeqNo=3 + in_vlan=0 + in_priority=0 + out_vlan=0 + out_priority=0 + meanSkip=1 + samplePool=3 + dropEvents=0 + in_ifindex=1004 + in_format=0 + out_ifindex=1003 + out_format=0 + hdr_prot=1 + pkt_len=110 + stripped=4 + hdr_len=106 + hdr=50-54-00-00-00-07-50-54-00-00-00-05-08-00-45-00-00-5C-00-00-00-00-40-01-F9-4D-C0-A8-00-01-C0-A8-00-02-08-00-13-FC-00-00-00-00-00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F-10-11-12-13-14-15-16-17-18-19-1A-1B-1C-1D-1E-1F-20-21-22-23-24-25-26-27-28-29-2A-2B-2C-2D-2E-2F-30-31-32-33-34-35-36-37-38-39-3A-3B-3C-3D-3E-3F HEADER - dgramSeqNo=1 - ds=127.0.0.1>2:1000 - fsSeqNo=4 - in_vlan=0 - in_priority=0 - out_vlan=0 - out_priority=0 - meanSkip=1 - samplePool=4 - dropEvents=0 - in_ifindex=1003 - in_format=0 - out_ifindex=1004 - out_format=0 - hdr_prot=1 - pkt_len=110 - stripped=4 - hdr_len=106 - hdr=50-54-00-00-00-05-50-54-00-00-00-07-08-00-45-00-00-5C-00-00-00-00-40-01-F9-4D-C0-A8-00-02-C0-A8-00-01-00-00-1B-FC-00-00-00-00-00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F-10-11-12-13-14-15-16-17-18-19-1A-1B-1C-1D-1E-1F-20-21-22-23-24-25-26-27-28-29-2A-2B-2C-2D-2E-2F-30-31-32-33-34-35-36-37-38-39-3A-3B-3C-3D-3E-3F + dgramSeqNo=1 + ds=127.0.0.1>2:1000 + fsSeqNo=4 + in_vlan=0 + in_priority=0 + out_vlan=0 + out_priority=0 + meanSkip=1 + samplePool=4 + dropEvents=0 + in_ifindex=1003 + in_format=0 + out_ifindex=1004 + out_format=0 + hdr_prot=1 + pkt_len=110 + stripped=4 + hdr_len=106 + hdr=50-54-00-00-00-05-50-54-00-00-00-07-08-00-45-00-00-5C-00-00-00-00-40-01-F9-4D-C0-A8-00-02-C0-A8-00-01-00-00-1B-FC-00-00-00-00-00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F-10-11-12-13-14-15-16-17-18-19-1A-1B-1C-1D-1E-1F-20-21-22-23-24-25-26-27-28-29-2A-2B-2C-2D-2E-2F-30-31-32-33-34-35-36-37-38-39-3A-3B-3C-3D-3E-3F HEADER - dgramSeqNo=1 - ds=127.0.0.1>2:1000 - fsSeqNo=5 - in_vlan=0 - in_priority=0 - out_vlan=0 - out_priority=0 - meanSkip=1 - samplePool=5 - dropEvents=0 - in_ifindex=1003 - in_format=0 - out_ifindex=1004 - out_format=0 - hdr_prot=1 - pkt_len=58 - stripped=4 - hdr_len=54 - hdr=50-54-00-00-00-05-50-54-00-00-00-07-86-DD-67-00-00-00-00-00-0A-80-FE-80-00-00-00-00-00-00-00-00-00-00-00-00-00-01-FE-80-00-00-00-00-00-00-00-00-00-00-00-00-00-02 + dgramSeqNo=1 + ds=127.0.0.1>2:1000 + fsSeqNo=5 + in_vlan=0 + in_priority=0 + out_vlan=0 + out_priority=0 + meanSkip=1 + samplePool=5 + dropEvents=0 + in_ifindex=1003 + in_format=0 + out_ifindex=1004 + out_format=0 + hdr_prot=1 + pkt_len=58 + stripped=4 + hdr_len=54 + hdr=50-54-00-00-00-05-50-54-00-00-00-07-86-DD-67-00-00-00-00-00-0A-80-FE-80-00-00-00-00-00-00-00-00-00-00-00-00-00-01-FE-80-00-00-00-00-00-00-00-00-00-00-00-00-00-02 ]) AT_CHECK_UNQUOTED([[sort sflow.log | $EGREP 'ETHCOUNTERS|IFCOUNTERS|ERROR|PORTNAME|OPENFLOWPORT' | head -24 | sed 's/ /\ - /g']], [0], [dnl + /g']], [0], [dnl ETHCOUNTERS - dot3StatsAlignmentErrors=4294967295 - dot3StatsFCSErrors=4294967295 - dot3StatsSingleCollisionFrames=4294967295 - dot3StatsMultipleCollisionFrames=4294967295 - dot3StatsSQETestErrors=4294967295 - dot3StatsDeferredTransmissions=4294967295 - dot3StatsLateCollisions=4294967295 - dot3StatsExcessiveCollisions=4294967295 - dot3StatsInternalMacTransmitErrors=4294967295 - dot3StatsCarrierSenseErrors=4294967295 - dot3StatsFrameTooLongs=4294967295 - dot3StatsInternalMacReceiveErrors=4294967295 - dot3StatsSymbolErrors=4294967295 + dot3StatsAlignmentErrors=4294967295 + dot3StatsFCSErrors=4294967295 + dot3StatsSingleCollisionFrames=4294967295 + dot3StatsMultipleCollisionFrames=4294967295 + dot3StatsSQETestErrors=4294967295 + dot3StatsDeferredTransmissions=4294967295 + dot3StatsLateCollisions=4294967295 + dot3StatsExcessiveCollisions=4294967295 + dot3StatsInternalMacTransmitErrors=4294967295 + dot3StatsCarrierSenseErrors=4294967295 + dot3StatsFrameTooLongs=4294967295 + dot3StatsInternalMacReceiveErrors=4294967295 + dot3StatsSymbolErrors=4294967295 ETHCOUNTERS - dot3StatsAlignmentErrors=4294967295 - dot3StatsFCSErrors=4294967295 - dot3StatsSingleCollisionFrames=4294967295 - dot3StatsMultipleCollisionFrames=4294967295 - dot3StatsSQETestErrors=4294967295 - dot3StatsDeferredTransmissions=4294967295 - dot3StatsLateCollisions=4294967295 - dot3StatsExcessiveCollisions=4294967295 - dot3StatsInternalMacTransmitErrors=4294967295 - dot3StatsCarrierSenseErrors=4294967295 - dot3StatsFrameTooLongs=4294967295 - dot3StatsInternalMacReceiveErrors=4294967295 - dot3StatsSymbolErrors=4294967295 + dot3StatsAlignmentErrors=4294967295 + dot3StatsFCSErrors=4294967295 + dot3StatsSingleCollisionFrames=4294967295 + dot3StatsMultipleCollisionFrames=4294967295 + dot3StatsSQETestErrors=4294967295 + dot3StatsDeferredTransmissions=4294967295 + dot3StatsLateCollisions=4294967295 + dot3StatsExcessiveCollisions=4294967295 + dot3StatsInternalMacTransmitErrors=4294967295 + dot3StatsCarrierSenseErrors=4294967295 + dot3StatsFrameTooLongs=4294967295 + dot3StatsInternalMacReceiveErrors=4294967295 + dot3StatsSymbolErrors=4294967295 ETHCOUNTERS - dot3StatsAlignmentErrors=4294967295 - dot3StatsFCSErrors=4294967295 - dot3StatsSingleCollisionFrames=4294967295 - dot3StatsMultipleCollisionFrames=4294967295 - dot3StatsSQETestErrors=4294967295 - dot3StatsDeferredTransmissions=4294967295 - dot3StatsLateCollisions=4294967295 - dot3StatsExcessiveCollisions=4294967295 - dot3StatsInternalMacTransmitErrors=4294967295 - dot3StatsCarrierSenseErrors=4294967295 - dot3StatsFrameTooLongs=4294967295 - dot3StatsInternalMacReceiveErrors=4294967295 - dot3StatsSymbolErrors=4294967295 + dot3StatsAlignmentErrors=4294967295 + dot3StatsFCSErrors=4294967295 + dot3StatsSingleCollisionFrames=4294967295 + dot3StatsMultipleCollisionFrames=4294967295 + dot3StatsSQETestErrors=4294967295 + dot3StatsDeferredTransmissions=4294967295 + dot3StatsLateCollisions=4294967295 + dot3StatsExcessiveCollisions=4294967295 + dot3StatsInternalMacTransmitErrors=4294967295 + dot3StatsCarrierSenseErrors=4294967295 + dot3StatsFrameTooLongs=4294967295 + dot3StatsInternalMacReceiveErrors=4294967295 + dot3StatsSymbolErrors=4294967295 ETHCOUNTERS - dot3StatsAlignmentErrors=4294967295 - dot3StatsFCSErrors=4294967295 - dot3StatsSingleCollisionFrames=4294967295 - dot3StatsMultipleCollisionFrames=4294967295 - dot3StatsSQETestErrors=4294967295 - dot3StatsDeferredTransmissions=4294967295 - dot3StatsLateCollisions=4294967295 - dot3StatsExcessiveCollisions=4294967295 - dot3StatsInternalMacTransmitErrors=4294967295 - dot3StatsCarrierSenseErrors=4294967295 - dot3StatsFrameTooLongs=4294967295 - dot3StatsInternalMacReceiveErrors=4294967295 - dot3StatsSymbolErrors=4294967295 + dot3StatsAlignmentErrors=4294967295 + dot3StatsFCSErrors=4294967295 + dot3StatsSingleCollisionFrames=4294967295 + dot3StatsMultipleCollisionFrames=4294967295 + dot3StatsSQETestErrors=4294967295 + dot3StatsDeferredTransmissions=4294967295 + dot3StatsLateCollisions=4294967295 + dot3StatsExcessiveCollisions=4294967295 + dot3StatsInternalMacTransmitErrors=4294967295 + dot3StatsCarrierSenseErrors=4294967295 + dot3StatsFrameTooLongs=4294967295 + dot3StatsInternalMacReceiveErrors=4294967295 + dot3StatsSymbolErrors=4294967295 ETHCOUNTERS - dot3StatsAlignmentErrors=4294967295 - dot3StatsFCSErrors=4294967295 - dot3StatsSingleCollisionFrames=4294967295 - dot3StatsMultipleCollisionFrames=4294967295 - dot3StatsSQETestErrors=4294967295 - dot3StatsDeferredTransmissions=4294967295 - dot3StatsLateCollisions=4294967295 - dot3StatsExcessiveCollisions=4294967295 - dot3StatsInternalMacTransmitErrors=4294967295 - dot3StatsCarrierSenseErrors=4294967295 - dot3StatsFrameTooLongs=4294967295 - dot3StatsInternalMacReceiveErrors=4294967295 - dot3StatsSymbolErrors=4294967295 + dot3StatsAlignmentErrors=4294967295 + dot3StatsFCSErrors=4294967295 + dot3StatsSingleCollisionFrames=4294967295 + dot3StatsMultipleCollisionFrames=4294967295 + dot3StatsSQETestErrors=4294967295 + dot3StatsDeferredTransmissions=4294967295 + dot3StatsLateCollisions=4294967295 + dot3StatsExcessiveCollisions=4294967295 + dot3StatsInternalMacTransmitErrors=4294967295 + dot3StatsCarrierSenseErrors=4294967295 + dot3StatsFrameTooLongs=4294967295 + dot3StatsInternalMacReceiveErrors=4294967295 + dot3StatsSymbolErrors=4294967295 ETHCOUNTERS - dot3StatsAlignmentErrors=4294967295 - dot3StatsFCSErrors=4294967295 - dot3StatsSingleCollisionFrames=4294967295 - dot3StatsMultipleCollisionFrames=4294967295 - dot3StatsSQETestErrors=4294967295 - dot3StatsDeferredTransmissions=4294967295 - dot3StatsLateCollisions=4294967295 - dot3StatsExcessiveCollisions=4294967295 - dot3StatsInternalMacTransmitErrors=4294967295 - dot3StatsCarrierSenseErrors=4294967295 - dot3StatsFrameTooLongs=4294967295 - dot3StatsInternalMacReceiveErrors=4294967295 - dot3StatsSymbolErrors=4294967295 + dot3StatsAlignmentErrors=4294967295 + dot3StatsFCSErrors=4294967295 + dot3StatsSingleCollisionFrames=4294967295 + dot3StatsMultipleCollisionFrames=4294967295 + dot3StatsSQETestErrors=4294967295 + dot3StatsDeferredTransmissions=4294967295 + dot3StatsLateCollisions=4294967295 + dot3StatsExcessiveCollisions=4294967295 + dot3StatsInternalMacTransmitErrors=4294967295 + dot3StatsCarrierSenseErrors=4294967295 + dot3StatsFrameTooLongs=4294967295 + dot3StatsInternalMacReceiveErrors=4294967295 + dot3StatsSymbolErrors=4294967295 IFCOUNTERS - dgramSeqNo=1 - ds=127.0.0.1>0:1003 - csSeqNo=1 - ifindex=1003 - type=6 - ifspeed=100000000 - direction=0 - status=0 - in_octets=202 - in_unicasts=3 - in_multicasts=4294967295 - in_broadcasts=4294967295 - in_discards=4294967295 - in_errors=4294967295 - in_unknownprotos=4294967295 - out_octets=148 - out_unicasts=2 - out_multicasts=4294967295 - out_broadcasts=4294967295 - out_discards=4294967295 - out_errors=4294967295 - promiscuous=0 + dgramSeqNo=1 + ds=127.0.0.1>0:1003 + csSeqNo=1 + ifindex=1003 + type=6 + ifspeed=100000000 + direction=0 + status=0 + in_octets=202 + in_unicasts=3 + in_multicasts=4294967295 + in_broadcasts=4294967295 + in_discards=4294967295 + in_errors=4294967295 + in_unknownprotos=4294967295 + out_octets=148 + out_unicasts=2 + out_multicasts=4294967295 + out_broadcasts=4294967295 + out_discards=4294967295 + out_errors=4294967295 + promiscuous=0 IFCOUNTERS - dgramSeqNo=1 - ds=127.0.0.1>0:1004 - csSeqNo=1 - ifindex=1004 - type=6 - ifspeed=100000000 - direction=0 - status=0 - in_octets=148 - in_unicasts=2 - in_multicasts=4294967295 - in_broadcasts=4294967295 - in_discards=4294967295 - in_errors=4294967295 - in_unknownprotos=4294967295 - out_octets=202 - out_unicasts=3 - out_multicasts=4294967295 - out_broadcasts=4294967295 - out_discards=4294967295 - out_errors=4294967295 - promiscuous=0 + dgramSeqNo=1 + ds=127.0.0.1>0:1004 + csSeqNo=1 + ifindex=1004 + type=6 + ifspeed=100000000 + direction=0 + status=0 + in_octets=148 + in_unicasts=2 + in_multicasts=4294967295 + in_broadcasts=4294967295 + in_discards=4294967295 + in_errors=4294967295 + in_unknownprotos=4294967295 + out_octets=202 + out_unicasts=3 + out_multicasts=4294967295 + out_broadcasts=4294967295 + out_discards=4294967295 + out_errors=4294967295 + promiscuous=0 IFCOUNTERS - dgramSeqNo=2 - ds=127.0.0.1>0:1002 - csSeqNo=1 - ifindex=1002 - type=6 - ifspeed=100000000 - direction=0 - status=0 - in_octets=0 - in_unicasts=0 - in_multicasts=4294967295 - in_broadcasts=4294967295 - in_discards=4294967295 - in_errors=4294967295 - in_unknownprotos=4294967295 - out_octets=84 - out_unicasts=2 - out_multicasts=4294967295 - out_broadcasts=4294967295 - out_discards=4294967295 - out_errors=4294967295 - promiscuous=0 + dgramSeqNo=2 + ds=127.0.0.1>0:1002 + csSeqNo=1 + ifindex=1002 + type=6 + ifspeed=100000000 + direction=0 + status=0 + in_octets=0 + in_unicasts=0 + in_multicasts=4294967295 + in_broadcasts=4294967295 + in_discards=4294967295 + in_errors=4294967295 + in_unknownprotos=4294967295 + out_octets=84 + out_unicasts=2 + out_multicasts=4294967295 + out_broadcasts=4294967295 + out_discards=4294967295 + out_errors=4294967295 + promiscuous=0 IFCOUNTERS - dgramSeqNo=3 - ds=127.0.0.1>0:1002 - csSeqNo=2 - ifindex=1002 - type=6 - ifspeed=100000000 - direction=0 - status=0 - in_octets=0 - in_unicasts=0 - in_multicasts=4294967295 - in_broadcasts=4294967295 - in_discards=4294967295 - in_errors=4294967295 - in_unknownprotos=4294967295 - out_octets=84 - out_unicasts=2 - out_multicasts=4294967295 - out_broadcasts=4294967295 - out_discards=4294967295 - out_errors=4294967295 - promiscuous=0 + dgramSeqNo=3 + ds=127.0.0.1>0:1002 + csSeqNo=2 + ifindex=1002 + type=6 + ifspeed=100000000 + direction=0 + status=0 + in_octets=0 + in_unicasts=0 + in_multicasts=4294967295 + in_broadcasts=4294967295 + in_discards=4294967295 + in_errors=4294967295 + in_unknownprotos=4294967295 + out_octets=84 + out_unicasts=2 + out_multicasts=4294967295 + out_broadcasts=4294967295 + out_discards=4294967295 + out_errors=4294967295 + promiscuous=0 IFCOUNTERS - dgramSeqNo=3 - ds=127.0.0.1>0:1003 - csSeqNo=2 - ifindex=1003 - type=6 - ifspeed=100000000 - direction=0 - status=0 - in_octets=202 - in_unicasts=3 - in_multicasts=4294967295 - in_broadcasts=4294967295 - in_discards=4294967295 - in_errors=4294967295 - in_unknownprotos=4294967295 - out_octets=148 - out_unicasts=2 - out_multicasts=4294967295 - out_broadcasts=4294967295 - out_discards=4294967295 - out_errors=4294967295 - promiscuous=0 + dgramSeqNo=3 + ds=127.0.0.1>0:1003 + csSeqNo=2 + ifindex=1003 + type=6 + ifspeed=100000000 + direction=0 + status=0 + in_octets=202 + in_unicasts=3 + in_multicasts=4294967295 + in_broadcasts=4294967295 + in_discards=4294967295 + in_errors=4294967295 + in_unknownprotos=4294967295 + out_octets=148 + out_unicasts=2 + out_multicasts=4294967295 + out_broadcasts=4294967295 + out_discards=4294967295 + out_errors=4294967295 + promiscuous=0 IFCOUNTERS - dgramSeqNo=3 - ds=127.0.0.1>0:1004 - csSeqNo=2 - ifindex=1004 - type=6 - ifspeed=100000000 - direction=0 - status=0 - in_octets=148 - in_unicasts=2 - in_multicasts=4294967295 - in_broadcasts=4294967295 - in_discards=4294967295 - in_errors=4294967295 - in_unknownprotos=4294967295 - out_octets=202 - out_unicasts=3 - out_multicasts=4294967295 - out_broadcasts=4294967295 - out_discards=4294967295 - out_errors=4294967295 - promiscuous=0 + dgramSeqNo=3 + ds=127.0.0.1>0:1004 + csSeqNo=2 + ifindex=1004 + type=6 + ifspeed=100000000 + direction=0 + status=0 + in_octets=148 + in_unicasts=2 + in_multicasts=4294967295 + in_broadcasts=4294967295 + in_discards=4294967295 + in_errors=4294967295 + in_unknownprotos=4294967295 + out_octets=202 + out_unicasts=3 + out_multicasts=4294967295 + out_broadcasts=4294967295 + out_discards=4294967295 + out_errors=4294967295 + promiscuous=0 OPENFLOWPORT - datapath_id=18364758544493064720 - port_no=1 + datapath_id=18364758544493064720 + port_no=1 OPENFLOWPORT - datapath_id=18364758544493064720 - port_no=1 + datapath_id=18364758544493064720 + port_no=1 OPENFLOWPORT - datapath_id=18364758544493064720 - port_no=2 + datapath_id=18364758544493064720 + port_no=2 OPENFLOWPORT - datapath_id=18364758544493064720 - port_no=2 + datapath_id=18364758544493064720 + port_no=2 OPENFLOWPORT - datapath_id=18364758544493064720 - port_no=65534 + datapath_id=18364758544493064720 + port_no=65534 OPENFLOWPORT - datapath_id=18364758544493064720 - port_no=65534 + datapath_id=18364758544493064720 + port_no=65534 PORTNAME - portName=br0 + portName=br0 PORTNAME - portName=br0 + portName=br0 PORTNAME - portName=p1 + portName=p1 PORTNAME - portName=p1 + portName=p1 PORTNAME - portName=p2 + portName=p2 PORTNAME - portName=p2 + portName=p2 ])]) AT_SETUP([ofproto-dpif - basic truncate action]) @@ -6489,19 +6489,19 @@ dnl Test sFlow LAG structures AT_SETUP([ofproto-dpif - sFlow packet sampling - LACP structures]) AT_SKIP_IF([test "$IS_WIN32" = "yes"]) OVS_VSWITCHD_START([dnl - add-bond br0 bond p1 p2 -- \ - set Port bond lacp=active bond-mode=active-backup \ - other_config:lacp-time="fast" \ - other_config:lacp-system-id=11:22:33:44:55:66 \ - other_config:lacp-system-priority=54321 -- \ - set Interface p1 type=dummy \ - other_config:lacp-port-id=11 \ - other_config:lacp-port-priority=111 \ - other_config:lacp-aggregation-key=3333 -- \ - set Interface p2 type=dummy \ - other_config:lacp-port-id=22 \ - other_config:lacp-port-priority=222 \ - other_config:lacp-aggregation-key=3333 ]) + add-bond br0 bond p1 p2 -- \ + set Port bond lacp=active bond-mode=active-backup \ + other_config:lacp-time="fast" \ + other_config:lacp-system-id=11:22:33:44:55:66 \ + other_config:lacp-system-priority=54321 -- \ + set Interface p1 type=dummy \ + other_config:lacp-port-id=11 \ + other_config:lacp-port-priority=111 \ + other_config:lacp-aggregation-key=3333 -- \ + set Interface p2 type=dummy \ + other_config:lacp-port-id=22 \ + other_config:lacp-port-priority=222 \ + other_config:lacp-aggregation-key=3333 ]) on_exit 'kill `cat test-sflow.pid`' AT_CHECK([ovstest test-sflow --log-file --detach --no-chdir --pidfile 0:127.0.0.1 > sflow.log], [0], [], [ignore]) @@ -6511,9 +6511,9 @@ PARSE_LISTENING_PORT([test-sflow.log], [SFLOW_PORT]) ovs-appctl time/stop ovs-vsctl \ - set Interface p1 options:ifindex=1003 -- \ - set Bridge br0 sflow=@sf -- \ - --id=@sf create sflow targets=\"127.0.0.1:$SFLOW_PORT\" \ + set Interface p1 options:ifindex=1003 -- \ + set Bridge br0 sflow=@sf -- \ + --id=@sf create sflow targets=\"127.0.0.1:$SFLOW_PORT\" \ header=128 sampling=1 polling=1 agent=127.0.0.1 dnl sleep long enough to get the sFlow datagram flushed out (may be delayed for up to 1 second) @@ -6522,23 +6522,23 @@ AT_CHECK([ovs-appctl revalidator/purge], [0]) OVS_VSWITCHD_STOP OVS_APP_EXIT_AND_WAIT([test-sflow]) AT_CHECK([[sort sflow.log | $EGREP 'LACPCOUNTERS|ERROR' | head -n 1 | sed 's/ /\ - /g']], [0], [dnl + /g']], [0], [dnl LACPCOUNTERS - sysID=11:22:33:44:55:66 - partnerID=00:00:00:00:00:00 - aggID=3333 - actorAdmin=0x7 - actorOper=0xbf - partnerAdmin=0x0 - partnerOper=0x2 - LACPDUsRx=0 - markerPDUsRx=4294967295 - markerRespPDUsRx=4294967295 - unknownRx=4294967295 - illegalRx=0 - LACPDUsTx=1 - markerPDUsTx=4294967295 - markerRespPDUsTx=4294967295 + sysID=11:22:33:44:55:66 + partnerID=00:00:00:00:00:00 + aggID=3333 + actorAdmin=0x7 + actorOper=0xbf + partnerAdmin=0x0 + partnerOper=0x2 + LACPDUsRx=0 + markerPDUsRx=4294967295 + markerRespPDUsRx=4294967295 + unknownRx=4294967295 + illegalRx=0 + LACPDUsTx=1 + markerPDUsTx=4294967295 + markerRespPDUsTx=4294967295 ]) AT_CLEANUP @@ -6555,7 +6555,7 @@ ovs-appctl time/stop OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP AT_CHECK([ovs-vsctl add-port br0 gre0 -- set Interface gre0 type=gre \ - options:remote_ip=1.1.1.1 options:key=456 ofport_request=3]) + options:remote_ip=1.1.1.1 options:key=456 ofport_request=3]) AT_CHECK([ovs-vsctl add-port br0 p1 -- set Interface p1 type=dummy ofport_request=4]) AT_CHECK([ovs-ofctl add-flow br0 action=3]) @@ -6577,36 +6577,36 @@ done OVS_APP_EXIT_AND_WAIT([test-sflow]) AT_CHECK_UNQUOTED([[sort sflow.log | $EGREP 'HEADER|ERROR' | sed 's/ /\ - /g']], [0], [dnl + /g']], [0], [dnl HEADER - dgramSeqNo=1 - ds=127.0.0.1>2:1000 - fsSeqNo=1 - tunnel4_out_length=0 - tunnel4_out_protocol=47 - tunnel4_out_src=0.0.0.0 - tunnel4_out_dst=1.1.1.1 - tunnel4_out_src_port=0 - tunnel4_out_dst_port=0 - tunnel4_out_tcp_flags=0 - tunnel4_out_tos=1 - tunnel_out_vni=456 - in_vlan=0 - in_priority=0 - out_vlan=0 - out_priority=0 - meanSkip=1 - samplePool=1 - dropEvents=0 - in_ifindex=0 - in_format=0 - out_ifindex=1 - out_format=2 - hdr_prot=1 - pkt_len=110 - stripped=4 - hdr_len=106 - hdr=50-54-00-00-00-0A-50-54-00-00-00-09-08-00-45-01-00-5C-00-00-00-00-80-01-12-8A-0A-0A-0A-02-0A-0A-0A-01-08-00-13-FC-00-00-00-00-00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F-10-11-12-13-14-15-16-17-18-19-1A-1B-1C-1D-1E-1F-20-21-22-23-24-25-26-27-28-29-2A-2B-2C-2D-2E-2F-30-31-32-33-34-35-36-37-38-39-3A-3B-3C-3D-3E-3F + dgramSeqNo=1 + ds=127.0.0.1>2:1000 + fsSeqNo=1 + tunnel4_out_length=0 + tunnel4_out_protocol=47 + tunnel4_out_src=0.0.0.0 + tunnel4_out_dst=1.1.1.1 + tunnel4_out_src_port=0 + tunnel4_out_dst_port=0 + tunnel4_out_tcp_flags=0 + tunnel4_out_tos=1 + tunnel_out_vni=456 + in_vlan=0 + in_priority=0 + out_vlan=0 + out_priority=0 + meanSkip=1 + samplePool=1 + dropEvents=0 + in_ifindex=0 + in_format=0 + out_ifindex=1 + out_format=2 + hdr_prot=1 + pkt_len=110 + stripped=4 + hdr_len=106 + hdr=50-54-00-00-00-0A-50-54-00-00-00-09-08-00-45-01-00-5C-00-00-00-00-80-01-12-8A-0A-0A-0A-02-0A-0A-0A-01-08-00-13-FC-00-00-00-00-00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F-10-11-12-13-14-15-16-17-18-19-1A-1B-1C-1D-1E-1F-20-21-22-23-24-25-26-27-28-29-2A-2B-2C-2D-2E-2F-30-31-32-33-34-35-36-37-38-39-3A-3B-3C-3D-3E-3F ]) OVS_VSWITCHD_STOP @@ -6679,36 +6679,36 @@ done OVS_APP_EXIT_AND_WAIT([test-sflow]) AT_CHECK_UNQUOTED([[sort sflow.log | $EGREP 'HEADER|ERROR' | sed 's/ /\ - /g']], [0], [dnl + /g']], [0], [dnl HEADER - dgramSeqNo=1 - ds=127.0.0.1>2:1000 - fsSeqNo=1 - tunnel4_out_length=0 - tunnel4_out_protocol=47 - tunnel4_out_src=1.1.2.88 - tunnel4_out_dst=1.1.2.92 - tunnel4_out_src_port=0 - tunnel4_out_dst_port=0 - tunnel4_out_tcp_flags=0 - tunnel4_out_tos=0 - tunnel_out_vni=456 - in_vlan=0 - in_priority=0 - out_vlan=0 - out_priority=0 - meanSkip=1 - samplePool=1 - dropEvents=0 - in_ifindex=2011 - in_format=0 - out_ifindex=1 - out_format=2 - hdr_prot=1 - pkt_len=110 - stripped=4 - hdr_len=106 - hdr=50-54-00-00-00-0A-50-54-00-00-00-05-08-00-45-00-00-5C-00-00-00-00-80-01-B6-4D-C0-A8-01-01-C0-A8-02-02-08-00-13-FC-00-00-00-00-00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F-10-11-12-13-14-15-16-17-18-19-1A-1B-1C-1D-1E-1F-20-21-22-23-24-25-26-27-28-29-2A-2B-2C-2D-2E-2F-30-31-32-33-34-35-36-37-38-39-3A-3B-3C-3D-3E-3F + dgramSeqNo=1 + ds=127.0.0.1>2:1000 + fsSeqNo=1 + tunnel4_out_length=0 + tunnel4_out_protocol=47 + tunnel4_out_src=1.1.2.88 + tunnel4_out_dst=1.1.2.92 + tunnel4_out_src_port=0 + tunnel4_out_dst_port=0 + tunnel4_out_tcp_flags=0 + tunnel4_out_tos=0 + tunnel_out_vni=456 + in_vlan=0 + in_priority=0 + out_vlan=0 + out_priority=0 + meanSkip=1 + samplePool=1 + dropEvents=0 + in_ifindex=2011 + in_format=0 + out_ifindex=1 + out_format=2 + hdr_prot=1 + pkt_len=110 + stripped=4 + hdr_len=106 + hdr=50-54-00-00-00-0A-50-54-00-00-00-05-08-00-45-00-00-5C-00-00-00-00-80-01-B6-4D-C0-A8-01-01-C0-A8-02-02-08-00-13-FC-00-00-00-00-00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F-10-11-12-13-14-15-16-17-18-19-1A-1B-1C-1D-1E-1F-20-21-22-23-24-25-26-27-28-29-2A-2B-2C-2D-2E-2F-30-31-32-33-34-35-36-37-38-39-3A-3B-3C-3D-3E-3F ]) OVS_VSWITCHD_STOP @@ -6748,59 +6748,59 @@ done OVS_APP_EXIT_AND_WAIT([test-sflow]) AT_CHECK_UNQUOTED([[sort sflow.log | $EGREP 'HEADER|ERROR' | sed 's/ /\ - /g']], [0], [dnl + /g']], [0], [dnl HEADER - dgramSeqNo=1 - ds=127.0.0.1>2:1000 - fsSeqNo=1 - mpls_label_0=789 - mpls_tc_0=4 - mpls_ttl_0=32 - mpls_bos_0=0 - mpls_label_1=11 - mpls_tc_1=3 - mpls_ttl_1=64 - mpls_bos_1=1 - in_vlan=0 - in_priority=0 - out_vlan=0 - out_priority=0 - meanSkip=1 - samplePool=1 - dropEvents=0 - in_ifindex=0 - in_format=0 - out_ifindex=1 - out_format=2 - hdr_prot=1 - pkt_len=22 - stripped=4 - hdr_len=18 - hdr=50-54-00-00-00-0A-50-54-00-00-00-09-88-47-00-00-B7-40 + dgramSeqNo=1 + ds=127.0.0.1>2:1000 + fsSeqNo=1 + mpls_label_0=789 + mpls_tc_0=4 + mpls_ttl_0=32 + mpls_bos_0=0 + mpls_label_1=11 + mpls_tc_1=3 + mpls_ttl_1=64 + mpls_bos_1=1 + in_vlan=0 + in_priority=0 + out_vlan=0 + out_priority=0 + meanSkip=1 + samplePool=1 + dropEvents=0 + in_ifindex=0 + in_format=0 + out_ifindex=1 + out_format=2 + hdr_prot=1 + pkt_len=22 + stripped=4 + hdr_len=18 + hdr=50-54-00-00-00-0A-50-54-00-00-00-09-88-47-00-00-B7-40 HEADER - dgramSeqNo=1 - ds=127.0.0.1>2:1000 - fsSeqNo=2 - mpls_label_0=789 - mpls_tc_0=4 - mpls_ttl_0=32 - mpls_bos_0=1 - in_vlan=0 - in_priority=0 - out_vlan=0 - out_priority=0 - meanSkip=1 - samplePool=2 - dropEvents=0 - in_ifindex=0 - in_format=0 - out_ifindex=1 - out_format=2 - hdr_prot=1 - pkt_len=38 - stripped=4 - hdr_len=34 - hdr=50-54-00-00-00-0A-50-54-00-00-00-09-08-00-45-00-00-14-00-00-00-00-00-00-BA-EB-00-00-00-00-00-00-00-00 + dgramSeqNo=1 + ds=127.0.0.1>2:1000 + fsSeqNo=2 + mpls_label_0=789 + mpls_tc_0=4 + mpls_ttl_0=32 + mpls_bos_0=1 + in_vlan=0 + in_priority=0 + out_vlan=0 + out_priority=0 + meanSkip=1 + samplePool=2 + dropEvents=0 + in_ifindex=0 + in_format=0 + out_ifindex=1 + out_format=2 + hdr_prot=1 + pkt_len=38 + stripped=4 + hdr_len=34 + hdr=50-54-00-00-00-0A-50-54-00-00-00-09-08-00-45-00-00-14-00-00-00-00-00-00-BA-EB-00-00-00-00-00-00-00-00 ]) OVS_VSWITCHD_STOP @@ -8855,7 +8855,7 @@ AT_CAPTURE_FILE([ofctl_monitor.log]) AT_CHECK([ovs-ofctl monitor br0 65534 invalid_ttl -P nxt_packet_in --detach --no-chdir --pidfile 2> ofctl_monitor.log]) for i in 1 2 3; do - AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 CONTROLLER controller '50540000000a5054000000091234']) + AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 CONTROLLER controller '50540000000a5054000000091234']) done OVS_APP_EXIT_AND_WAIT([ovs-ofctl]) @@ -8906,7 +8906,7 @@ AT_CAPTURE_FILE([ofctl_monitor.log]) AT_CHECK([ovs-ofctl monitor br1 65534 invalid_ttl -P nxt_packet_in --detach --no-chdir --pidfile 2> ofctl_monitor.log]) for i in 1 2 3; do - AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 CONTROLLER output:1 '50540000000a5054000000091234']) + AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 CONTROLLER output:1 '50540000000a5054000000091234']) done OVS_APP_EXIT_AND_WAIT([ovs-ofctl]) diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at index 8aa69ee95..7388a20a2 100644 --- a/tests/ofproto-macros.at +++ b/tests/ofproto-macros.at @@ -421,11 +421,11 @@ add_of_br () { local mac=aa:55:aa:55:00:0$brnum ovs-vsctl --timeout=20 \ -- add-br $br \ - -- set bridge $br datapath-type=dummy \ - fail-mode=secure \ - other-config:datapath-id=$dpid \ - other-config:hwaddr=$mac \ - protocols="[[OpenFlow10,OpenFlow11,OpenFlow12,\ + -- set bridge $br datapath-type=dummy \ + fail-mode=secure \ + other-config:datapath-id=$dpid \ + other-config:hwaddr=$mac \ + protocols="[[OpenFlow10,OpenFlow11,OpenFlow12,\ OpenFlow13,OpenFlow14,OpenFlow15,\ OpenFlow16]]" \ -- "$@" @@ -497,7 +497,7 @@ m4_define([OVS_VSWITCHD_DISABLE_TUNNEL_PUSH_POP], m4_define([WAIT_FOR_DUMMY_PORTS], \ [m4_foreach([dummy_port], [$@], [ \ - OVS_WAIT_WHILE([ovs-appctl netdev-dummy/conn-state dummy_port \ + OVS_WAIT_WHILE([ovs-appctl netdev-dummy/conn-state dummy_port \ | grep 'unknown\|disconnected'])])]) diff --git a/tests/ofproto.at b/tests/ofproto.at index 26a6ff698..9819bc577 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -3692,10 +3692,10 @@ OFPT_PORT_STATUS (OF1.4): MOD: ${INDEX}(test): addr:aa:55:aa:55:00:0x if test X"$1" = X"OFPTR_VACANCY_UP"; then shift; ovs-vsctl -- --id=@t1 create Flow_Table flow-limit=10 -- set bridge br0 flow_tables:1=@t1 - # Turn on vacancy events, then add flows until we're full. - # With initial vacancy of 100% and vacancy_up of 80%, so that - # vacancy >= vacancy_up, this enables VACANY_DOWN events, so - # we get a single such message when vacancy dips below 20%. + # Turn on vacancy events, then add flows until we're full. + # With initial vacancy of 100% and vacancy_up of 80%, so that + # vacancy >= vacancy_up, this enables VACANY_DOWN events, so + # we get a single such message when vacancy dips below 20%. ovs-ofctl -O OpenFlow14 mod-table br0 1 vacancy:20,80 ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=1,actions=2 ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=2,actions=2 @@ -3713,8 +3713,8 @@ table_desc:- eviction=off eviction_flags=OTHER|IMPORTANCE|LIFETIME vacancy=on vacancy_down=20% vacancy_up=80% vacancy=10%" # Then delete flows until we're empty. Sending the - # VACANCY_DOWN message enabled VACANCY_UP events, so we get a - # single such message when vacancy rises above 80%. + # VACANCY_DOWN message enabled VACANCY_UP events, so we get a + # single such message when vacancy rises above 80%. ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=1 ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=2 ovs-ofctl -O OpenFlow14 del-flows br0 table=1,in_port=3 @@ -3732,11 +3732,11 @@ table_desc:- vacancy=on vacancy_down=20% vacancy_up=80% vacancy=90%" # Now approach vacancy from the other direction. First - # disable vacancy events. With initial vacancy of 70%, so - # that vacancy < vacancy_up, this enables VACANCY_UP events. - # That means that filling up the table generates no message, - # but deleting all the flows generates VACANCY_UP at the point - # vacancy rises above 80%. + # disable vacancy events. With initial vacancy of 70%, so + # that vacancy < vacancy_up, this enables VACANCY_UP events. + # That means that filling up the table generates no message, + # but deleting all the flows generates VACANCY_UP at the point + # vacancy rises above 80%. ovs-ofctl -O OpenFlow14 mod-table br0 1 novacancy ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=1,actions=2 ovs-ofctl -O OpenFlow14 add-flow br0 table=1,in_port=2,actions=2 @@ -4924,11 +4924,11 @@ add_of_ports br0 1 2 3 set_and_check_specific_ofports () { ovs-vsctl set Interface p1 ofport_request="$1" -- \ - set Interface p2 ofport_request="$2" -- \ - set Interface p3 ofport_request="$3" + set Interface p2 ofport_request="$2" -- \ + set Interface p3 ofport_request="$3" ofports=`ovs-vsctl get Interface p1 ofport -- \ - get Interface p2 ofport -- \ - get Interface p3 ofport` + get Interface p2 ofport -- \ + get Interface p3 ofport` AT_CHECK_UNQUOTED([echo $ofports], [0], [$1 $2 $3 ]) } @@ -4936,8 +4936,8 @@ for pre in '1 2 3' '1 3 2' '2 1 3' '2 3 1' '3 1 2' '3 2 1'; do for post in '1 2 3' '1 3 2' '2 1 3' '2 3 1' '3 1 2' '3 2 1'; do echo ----------------------------------------------------------- echo "Check changing port numbers from $pre to $post" - set_and_check_specific_ofports $pre - set_and_check_specific_ofports $post + set_and_check_specific_ofports $pre + set_and_check_specific_ofports $post done done @@ -4945,7 +4945,7 @@ ovs-vsctl del-port p3 set_and_check_poorly_specified_ofports () { ovs-vsctl set Interface p1 ofport_request="$1" -- \ - set Interface p2 ofport_request="$2" + set Interface p2 ofport_request="$2" p1=`ovs-vsctl get Interface p1 ofport` p2=`ovs-vsctl get Interface p2 ofport` echo $p1 $p2 @@ -4953,8 +4953,8 @@ set_and_check_poorly_specified_ofports () { AT_CHECK([test "$p1" != "$p2"]) if test "$1" = "$2" && test "$1" != '[[]]'; then # One port number must be the requested one. - AT_CHECK([test "$p1" = "$1" || test "$p2" = "$1"]) - # The other port number must be different (already tested above). + AT_CHECK([test "$p1" = "$1" || test "$p2" = "$1"]) + # The other port number must be different (already tested above). else AT_CHECK([test "$1" = '[[]]' || test "$p1" = "$1"]) AT_CHECK([test "$2" = '[[]]' || test "$p2" = "$2"]) diff --git a/tests/ovn.at b/tests/ovn.at index f12c24c17..155150e02 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -1873,10 +1873,10 @@ done # Prints the name of the logical switch that contains LSP. lsp_to_ls () { case $1 in dnl ( - lp?[[12]]) echo ls1 ;; dnl ( - lp?[[34]]) echo ls2 ;; dnl ( - lp?5) echo ls3 ;; dnl ( - *) AT_FAIL_IF([:]) ;; + lp?[[12]]) echo ls1 ;; dnl ( + lp?[[34]]) echo ls2 ;; dnl ( + lp?5) echo ls3 ;; dnl ( + *) AT_FAIL_IF([:]) ;; esac } @@ -1896,7 +1896,7 @@ for i in 1 2; do ofport-request=$i$j lsp_name=lp$i$j - ls_name=$(lsp_to_ls $lsp_name) + ls_name=$(lsp_to_ls $lsp_name) ovn-nbctl lsp-add $ls_name $lsp_name ovn-nbctl lsp-set-addresses $lsp_name f0:00:00:00:00:$i$j @@ -6191,7 +6191,7 @@ get_final_nw_tos() { tos=$(echo "$flow" | sed -n 's/.*nw_tos=\([[0-9]]\{1,\}\).*/\1/p') case $tos in '') echo none ;; - *) echo $tos ;; + *) echo $tos ;; esac } diff --git a/tests/ovs-macros.at b/tests/ovs-macros.at index f3ab3548a..677eea753 100644 --- a/tests/ovs-macros.at +++ b/tests/ovs-macros.at @@ -227,12 +227,12 @@ uuidfilt () { # Not all shells support "exec -a NAME", so test for it. if (exec -a myname true); then run_as () { - (exec -a "$@") + (exec -a "$@") } else run_as () { shift - (exec "$@") + (exec "$@") } fi ] diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at index 72e845237..06597d7b5 100644 --- a/tests/ovs-ofctl.at +++ b/tests/ovs-ofctl.at @@ -2934,13 +2934,13 @@ AT_SETUP([tcp flags - filtering]) OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \ -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2]) AT_DATA([flows.txt], [dnl - in_port=1,tcp,tp_dst=80,tcp_flags=+syn-rst-ack-fin,action=2 # Allow outbound web traffic bare-SYN - in_port=1,tcp,tp_dst=80,tcp_flags=+ack,action=2 # Allow outbound web traffic with ACK bit - in_port=1,tcp,tp_dst=80,tcp_flags=+rst,action=2 # Allow outbound web traffic with RST bit - in_port=2,tcp,tp_src=80,tcp_flags=+ack,action=1 # Allow inbound web traffic with ACK bit - in_port=2,tcp,tp_src=80,tcp_flags=+rst,action=1 # Allow inbound web traffic with RST bit - priority=0,in_port=1,action=drop # Default drop outbound - priority=0,in_port=2,action=drop # Default drop inbound + in_port=1,tcp,tp_dst=80,tcp_flags=+syn-rst-ack-fin,action=2 # Allow outbound web traffic bare-SYN + in_port=1,tcp,tp_dst=80,tcp_flags=+ack,action=2 # Allow outbound web traffic with ACK bit + in_port=1,tcp,tp_dst=80,tcp_flags=+rst,action=2 # Allow outbound web traffic with RST bit + in_port=2,tcp,tp_src=80,tcp_flags=+ack,action=1 # Allow inbound web traffic with ACK bit + in_port=2,tcp,tp_src=80,tcp_flags=+rst,action=1 # Allow inbound web traffic with RST bit + priority=0,in_port=1,action=drop # Default drop outbound + priority=0,in_port=2,action=drop # Default drop inbound ]) AT_CHECK([ovs-ofctl add-flows br0 flows.txt]) diff --git a/tests/ovs-router.at b/tests/ovs-router.at index 843776257..6dacc2954 100644 --- a/tests/ovs-router.at +++ b/tests/ovs-router.at @@ -3,8 +3,8 @@ AT_BANNER([ovs-router]) AT_SETUP([appctl - route/add with gateway]) AT_KEYWORDS([ovs_router]) OVS_VSWITCHD_START([add-port br0 p2 -- set Interface p2 type=gre \ - options:local_ip=2.2.2.2 options:remote_ip=1.1.1.1 \ - -- add-port br0 p1 -- set interface p1 type=dummy]) + options:local_ip=2.2.2.2 options:remote_ip=1.1.1.1 \ + -- add-port br0 p1 -- set interface p1 type=dummy]) AT_CHECK([ovs-appctl netdev-dummy/ip4addr br0 2.2.2.2/24], [0], [OK ]) AT_CHECK([ovs-appctl ovs/route/add 1.1.1.0/24 br0 2.2.2.10], [0], [OK diff --git a/tests/ovsdb-client.at b/tests/ovsdb-client.at index 467175f1a..8d777a027 100644 --- a/tests/ovsdb-client.at +++ b/tests/ovsdb-client.at @@ -57,8 +57,8 @@ AT_CHECK( ["ordinals", {"op": "update", "table": "ordinals", - "where": [], - "row": {"name": ""}}]']], + "where": [], + "row": {"name": ""}}]']], [0], [[[{"count":6}] ]]) @@ -138,10 +138,10 @@ dnl Use "query" for some of them, which won't have any effect. AT_CHECK( [[for txn in 'transact zero 0' \ 'query one 1' \ - 'transact two 2' \ - 'query three 3' \ - 'transact four 4' \ - 'query five 5' + 'transact two 2' \ + 'query three 3' \ + 'transact four 4' \ + 'query five 5' do set -- $txn ovsdb-client $1 ' diff --git a/tests/ovsdb-cluster.at b/tests/ovsdb-cluster.at index b23adc6a5..1c4149155 100644 --- a/tests/ovsdb-cluster.at +++ b/tests/ovsdb-cluster.at @@ -15,10 +15,10 @@ ovsdb_check_cluster () { on_exit 'kill `cat *.pid`' for i in `seq $n`; do - AT_CHECK([ovsdb-server -vraft -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i --remote=punix:s$i.ovsdb s$i.db]) + AT_CHECK([ovsdb-server -vraft -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i --remote=punix:s$i.ovsdb s$i.db]) done for i in `seq $n`; do - AT_CHECK([ovsdb-client --timeout=30 wait unix:s$i.ovsdb $schema connected]) + AT_CHECK([ovsdb-client --timeout=30 wait unix:s$i.ovsdb $schema connected]) done for txn @@ -28,7 +28,7 @@ ovsdb_check_cluster () { done AT_CHECK_UNQUOTED([uuidfilt output], [0], [$output]) for i in `seq $n`; do - OVS_APP_EXIT_AND_WAIT_BY_TARGET([`pwd`/s$i], [s$i.pid]) + OVS_APP_EXIT_AND_WAIT_BY_TARGET([`pwd`/s$i], [s$i.pid]) done AT_CHECK([ovsdb-tool check-cluster s*.db]) @@ -67,8 +67,8 @@ AT_BANNER([OVSDB - cluster tests]) # Torture test. OVS_START_SHELL_HELPERS ovsdb_torture_test () { - local n=$1 # Number of cluster members - local victim=$2 # Cluster member to kill or remove + local n=$1 # Number of cluster members + local victim=$2 # Cluster member to kill or remove local variant=$3 # 'kill' and restart or 'remove' and add cp $top_srcdir/ovn/ovn-sb.ovsschema schema schema=`ovsdb-tool schema-name schema` @@ -78,44 +78,44 @@ ovsdb|WARN|schema: changed 2 columns in 'OVN_Southbound' database from ephemeral join_cluster() { local i=$1 - others= - for j in `seq 1 $n`; do - if test $i != $j; then - others="$others unix:s$j.raft" + others= + for j in `seq 1 $n`; do + if test $i != $j; then + others="$others unix:s$j.raft" fi - done - AT_CHECK([ovsdb-tool join-cluster s$i.db $schema unix:s$i.raft $others]) + done + AT_CHECK([ovsdb-tool join-cluster s$i.db $schema unix:s$i.raft $others]) } start_server() { local i=$1 - printf "\ns$i: starting\n" - AT_CHECK([ovsdb-server -vjsonrpc -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i --remote=punix:s$i.ovsdb s$i.db]) + printf "\ns$i: starting\n" + AT_CHECK([ovsdb-server -vjsonrpc -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i --remote=punix:s$i.ovsdb s$i.db]) } stop_server() { local i=$1 - printf "\ns$i: stopping\n" + printf "\ns$i: stopping\n" OVS_APP_EXIT_AND_WAIT_BY_TARGET([`pwd`/s$i], [s$i.pid]) } connect_server() { local i=$1 - printf "\ns$i: waiting to connect to storage\n" - AT_CHECK([ovsdb-client --timeout=30 -vfile -vsyslog:off -vvlog:off --log-file=connect$i.log wait unix:s$i.ovsdb $schema connected]) + printf "\ns$i: waiting to connect to storage\n" + AT_CHECK([ovsdb-client --timeout=30 -vfile -vsyslog:off -vvlog:off --log-file=connect$i.log wait unix:s$i.ovsdb $schema connected]) } remove_server() { local i=$1 - printf "\ns$i: removing from cluster\n" - AT_CHECK([ovs-appctl --timeout=30 -t "`pwd`"/s$i cluster/leave OVN_Southbound]) - printf "\ns$i: waiting for removal to complete\n" - AT_CHECK([ovsdb-client --timeout=30 -vfile -vsyslog:off -vvlog:off --log-file=remove$i.log wait unix:s$i.ovsdb $schema removed]) - stop_server $victim + printf "\ns$i: removing from cluster\n" + AT_CHECK([ovs-appctl --timeout=30 -t "`pwd`"/s$i cluster/leave OVN_Southbound]) + printf "\ns$i: waiting for removal to complete\n" + AT_CHECK([ovsdb-client --timeout=30 -vfile -vsyslog:off -vvlog:off --log-file=remove$i.log wait unix:s$i.ovsdb $schema removed]) + stop_server $victim } add_server() { local i=$1 - rm s$i.db + rm s$i.db join_cluster $i - start_server $i - connect_server $i + start_server $i + connect_server $i } cid=`ovsdb-tool db-cid s1.db` @@ -134,16 +134,16 @@ ovsdb|WARN|schema: changed 2 columns in 'OVN_Southbound' database from ephemeral n1=10 n2=5 echo "starting $n1*$n2 ovn-sbctl processes..." for i in $(seq 0 $(expr $n1 - 1) ); do - (for j in $(seq $n2); do + (for j in $(seq $n2); do : > $i-$j.running - run_as "ovn-sbctl($i-$j)" ovn-sbctl "-vPATTERN:console:ovn-sbctl($i-$j)|%D{%H:%M:%S}|%05N|%c|%p|%m" --log-file=$i-$j.log -vfile -vsyslog:off -vtimeval:off --timeout=120 --no-leader-only add SB_Global . external_ids $i-$j=$i-$j - status=$? - if test $status != 0; then - echo "$i-$j exited with status $status" > $i-$j:$status + run_as "ovn-sbctl($i-$j)" ovn-sbctl "-vPATTERN:console:ovn-sbctl($i-$j)|%D{%H:%M:%S}|%05N|%c|%p|%m" --log-file=$i-$j.log -vfile -vsyslog:off -vtimeval:off --timeout=120 --no-leader-only add SB_Global . external_ids $i-$j=$i-$j + status=$? + if test $status != 0; then + echo "$i-$j exited with status $status" > $i-$j:$status fi rm $i-$j.running - done - : > $i.done)& + done + : > $i.done)& done echo "...done" sleep 2 @@ -153,44 +153,44 @@ ovsdb|WARN|schema: changed 2 columns in 'OVN_Southbound' database from ephemeral i=0 (while :; do echo; sleep 1; done) | while read; do printf "t=%2d s:" $i - done=0 + done=0 for j in $(seq 0 $(expr $n1 - 1)); do - if test -f $j.done; then - printf " $j" - done=$(expr $done + 1) + if test -f $j.done; then + printf " $j" + done=$(expr $done + 1) fi - done - printf '\n' - if test $done = $n1; then - break + done + printf '\n' + if test $done = $n1; then + break fi case $phase in # ( - 0) + 0) if test $done -ge $(expr $n1 / 4); then - if test $variant = kill; then - stop_server $victim - else - remove_server $victim - fi - phase=1 - next=$(expr $i + 2) + if test $variant = kill; then + stop_server $victim + else + remove_server $victim + fi + phase=1 + next=$(expr $i + 2) fi - ;; # ( + ;; # ( 1) - if test $i -ge $next; then - if test $variant = kill; then - start_server $victim - connect_server $victim - else - add_server $victim - fi - phase=2 - fi - ;; - esac + if test $i -ge $next; then + if test $variant = kill; then + start_server $victim + connect_server $victim + else + add_server $victim + fi + phase=2 + fi + ;; + esac - i=$(expr $i + 1) + i=$(expr $i + 1) done echo "...done" AT_CHECK([if test $phase != 2; then exit 77; fi]) @@ -203,9 +203,9 @@ ovsdb|WARN|schema: changed 2 columns in 'OVN_Southbound' database from ephemeral AT_CHECK([ovn-sbctl --timeout=30 --log-file=finalize.log -vtimeval:off -vfile -vsyslog:off --bare get SB_Global . external-ids | sed 's/, /\n/g; s/[[{}""]]//g;' | sort], [0], [expout]) for i in `seq $n`; do - if test $i != $victim || test $phase != 1; then - stop_server $i - fi + if test $i != $victim || test $phase != 1; then + stop_server $i + fi done # We ignore stdout because non-fatal warnings get printed there. diff --git a/tests/ovsdb-condition.at b/tests/ovsdb-condition.at index e7182c558..4b613e5f6 100644 --- a/tests/ovsdb-condition.at +++ b/tests/ovsdb-condition.at @@ -12,7 +12,7 @@ OVSDB_CHECK_POSITIVE([conditions on scalars], {"i": {"type": "integer"}, "r": {"type": "real"}, "b": {"type": "boolean"}, - "s": {"type": "string"}, + "s": {"type": "string"}, "u": {"type": "uuid"}}}' \ '[["i", "==", 0]]' \ '[["i", "!=", 1]]' \ @@ -79,7 +79,7 @@ AT_CHECK([[test-ovsdb parse-conditions \ {"i": {"type": "integer"}, "r": {"type": "real"}, "b": {"type": "boolean"}, - "s": {"type": "string"}, + "s": {"type": "string"}, "u": {"type": "uuid"}}}' \ '[["b", ">", true]]' \ '[["b", ">=", false]]' \ @@ -115,7 +115,7 @@ OVSDB_CHECK_POSITIVE([conditions on sets], {"i": {"type": {"key": "integer", "min": 0, "max": "unlimited"}}, "r": {"type": {"key": "real", "min": 0, "max": "unlimited"}}, "b": {"type": {"key": "boolean", "min": 0, "max": "unlimited"}}, - "s": {"type": {"key": "string", "min": 0, "max": "unlimited"}}, + "s": {"type": {"key": "string", "min": 0, "max": "unlimited"}}, "u": {"type": {"key": "uuid", "min": 0, "max": "unlimited"}}}}' \ '[["i", "==", ["set", []]]]' \ '[["i", "!=", ["set", [1]]]]' \ diff --git a/tests/ovsdb-idl.at b/tests/ovsdb-idl.at index 9caa02aad..cff08b183 100644 --- a/tests/ovsdb-idl.at +++ b/tests/ovsdb-idl.at @@ -844,7 +844,7 @@ AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl uni "table": "link1", "where": [], "row": {"k": ["uuid", "#0#"]}}]']], - [0], [stdout], [stderr]) + [0], [stdout], [stderr]) AT_CHECK([sort stdout | uuidfilt], [0], [[000: empty 001: {"error":null,"result":[{"uuid":["uuid","<0>"]}]} diff --git a/tests/ovsdb-log.at b/tests/ovsdb-log.at index 4577558df..00a244ba4 100644 --- a/tests/ovsdb-log.at +++ b/tests/ovsdb-log.at @@ -85,14 +85,14 @@ for option in '' --no-rename-open-files; do rm -f file AT_CHECK( [[test-ovsdb $option log-io file create \ - 'write:{"x":0}' \ - 'replace_start' \ - 'new-write:{"x":1}' \ - 'new-write:{"x":2}' \ - 'old-write:{"x":4}' \ - 'replace_commit' \ - 'read' \ - 'write:{"x":3}']], [0], + 'write:{"x":0}' \ + 'replace_start' \ + 'new-write:{"x":1}' \ + 'new-write:{"x":2}' \ + 'old-write:{"x":4}' \ + 'replace_commit' \ + 'read' \ + 'write:{"x":3}']], [0], [[file: open successful file: write:{"x":0} successful file: replace_start successful @@ -122,14 +122,14 @@ for option in '' --no-rename-open-files; do rm -f file AT_CHECK( [[test-ovsdb $option log-io file create \ - 'write:{"x":0}' \ - 'replace_start' \ - 'new-write:{"x":1}' \ - 'new-write:{"x":2}' \ - 'old-write:{"x":4}' \ - 'replace_abort' \ - 'read' \ - 'write:{"x":3}']], [0], + 'write:{"x":0}' \ + 'replace_start' \ + 'new-write:{"x":1}' \ + 'new-write:{"x":2}' \ + 'old-write:{"x":4}' \ + 'replace_abort' \ + 'read' \ + 'write:{"x":3}']], [0], [[file: open successful file: write:{"x":0} successful file: replace_start successful diff --git a/tests/ovsdb-monitor.at b/tests/ovsdb-monitor.at index c06dbb272..5458d422e 100644 --- a/tests/ovsdb-monitor.at +++ b/tests/ovsdb-monitor.at @@ -9,20 +9,20 @@ ovsdb_check_monitor () { $schema_func > schema AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) while test "$1" != "--"; do - AT_CHECK([ovsdb-tool transact db "$1"], [0], [ignore], [ignore]) - shift + AT_CHECK([ovsdb-tool transact db "$1"], [0], [ignore], [ignore]) + shift done shift AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket --log-file db > ovsdb-server.stdout 2> ovsdb-server.stderr], - [0], [], []) + [0], [], []) on_exit 'kill `cat ovsdb-server.pid`' if test "$IS_WIN32" = "yes"; then AT_CHECK([ovsdb-client -vjsonrpc --pidfile --log-file -d json monitor --format=csv unix:socket $db $table $columns > output 2> ovsdb-client.stderr &], - [0], [ignore], [ignore]) + [0], [ignore], [ignore]) sleep 1 else AT_CHECK([ovsdb-client -vjsonrpc --detach --pidfile --log-file -d json monitor --format=csv unix:socket $db $table $columns > output 2> ovsdb-client.stderr], - [0], [ignore], [ignore]) + [0], [ignore], [ignore]) fi on_exit 'kill `cat ovsdb-client.pid`' for txn in ${1+"$@"} '[["'$db'"]]'; do @@ -92,7 +92,7 @@ m4_define([OVSDB_CHECK_MONITOR_COND], AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --remote=punix:socket --log-file="`pwd`"/ovsdb-server-log db >/dev/null 2>&1]) on_exit 'kill `cat ovsdb-server.pid`' AT_CHECK([ovsdb-client -vjsonrpc --pidfile --detach --no-chdir -d json monitor-cond --format=csv unix:socket $4 '[$8]' $5 $9 > output], - [0], [ignore], [ignore]) + [0], [ignore], [ignore]) on_exit 'kill `cat ovsdb-client.pid`' for txn in m4_foreach([txn], [$6], ['txn' ]); do AT_CHECK([ovsdb-client transact unix:socket "$txn"], [0], diff --git a/tests/ovsdb-mutation.at b/tests/ovsdb-mutation.at index fc898b56d..2981c5393 100644 --- a/tests/ovsdb-mutation.at +++ b/tests/ovsdb-mutation.at @@ -12,7 +12,7 @@ OVSDB_CHECK_POSITIVE([mutations on scalars], {"i": {"type": "integer"}, "r": {"type": "real"}, "b": {"type": "boolean"}, - "s": {"type": "string"}, + "s": {"type": "string"}, "u": {"type": "uuid"}}}' \ '[["i", "+=", 0]]' \ '[["i", "-=", 1]]' \ @@ -41,7 +41,7 @@ AT_CHECK([[test-ovsdb parse-mutations \ {"i": {"type": "integer"}, "r": {"type": "real"}, "b": {"type": "boolean"}, - "s": {"type": "string"}, + "s": {"type": "string"}, "u": {"type": "uuid"}}}' \ '[["i", "xxx", 1]]' \ '[["i", "insert", 1]]' \ @@ -117,7 +117,7 @@ OVSDB_CHECK_POSITIVE([mutations on sets], {"i": {"type": {"key": "integer", "min": 0, "max": "unlimited"}}, "r": {"type": {"key": "real", "min": 0, "max": "unlimited"}}, "b": {"type": {"key": "boolean", "min": 0, "max": "unlimited"}}, - "s": {"type": {"key": "string", "min": 0, "max": "unlimited"}}, + "s": {"type": {"key": "string", "min": 0, "max": "unlimited"}}, "u": {"type": {"key": "uuid", "min": 0, "max": "unlimited"}}}}' \ '[["i", "+=", 1]]' \ '[["i", "-=", 2]]' \ diff --git a/tests/ovsdb-query.at b/tests/ovsdb-query.at index 2c2b648d8..0814fda2a 100644 --- a/tests/ovsdb-query.at +++ b/tests/ovsdb-query.at @@ -6,7 +6,7 @@ OVSDB_CHECK_POSITIVE([queries on scalars], {"i": {"type": "integer"}, "r": {"type": "real"}, "b": {"type": "boolean"}, - "s": {"type": "string"}, + "s": {"type": "string"}, "u": {"type": "uuid"}}}' \ '[{"i": 0, "r": 0.5, @@ -354,7 +354,7 @@ OVSDB_CHECK_POSITIVE([UUID-distinct queries on scalars], {"i": {"type": "integer"}, "r": {"type": "real"}, "b": {"type": "boolean"}, - "s": {"type": "string"}, + "s": {"type": "string"}, "u": {"type": "uuid"}}}' \ '[{"i": 0, "r": 0.5, @@ -447,7 +447,7 @@ OVSDB_CHECK_POSITIVE([Boolean-distinct queries on scalars], {"i": {"type": "integer"}, "r": {"type": "real"}, "b": {"type": "boolean"}, - "s": {"type": "string"}, + "s": {"type": "string"}, "u": {"type": "uuid"}}}' \ '[{"i": 0, "r": 0.5, diff --git a/tests/ovsdb-row.at b/tests/ovsdb-row.at index 0b2ae77b1..891f95329 100644 --- a/tests/ovsdb-row.at +++ b/tests/ovsdb-row.at @@ -116,7 +116,7 @@ OVSDB_CHECK_POSITIVE([row hashing (scalars)], {"i": {"type": "integer"}, "r": {"type": "real"}, "b": {"type": "boolean"}, - "s": {"type": "string"}, + "s": {"type": "string"}, "u": {"type": "uuid"}}}' \ '["null", {}]' \ '["i1", {"i": 1}]' \ @@ -185,7 +185,7 @@ OVSDB_CHECK_POSITIVE([row hashing (sets)], {"i": {"type": {"key": "integer", "min": 0, "max": "unlimited"}}, "r": {"type": {"key": "real", "min": 0, "max": "unlimited"}}, "b": {"type": {"key": "boolean", "min": 0, "max": "unlimited"}}, - "s": {"type": {"key": "string", "min": 0, "max": "unlimited"}}, + "s": {"type": {"key": "string", "min": 0, "max": "unlimited"}}, "u": {"type": {"key": "uuid", "min": 0, "max": "unlimited"}}}}' \ '["null0", {"i": ["set", []]}]' \ '["i0", {"i": ["set", [0]]}]' \ @@ -241,7 +241,7 @@ OVSDB_CHECK_POSITIVE([row hashing (maps)], "min": 0, "max": "unlimited"}}, "bb": {"type": {"key": "boolean", "value": "boolean", "min": 0, "max": "unlimited"}}, - "ss": {"type": {"key": "string", "value": "string", + "ss": {"type": {"key": "string", "value": "string", "min": 0, "max": "unlimited"}}}}' \ '["null", {}]' \ '["ii0", {"ii": ["map", [[0, 0]]]}]' \ diff --git a/tests/ovsdb-schema.at b/tests/ovsdb-schema.at index 9957ebdd4..d606d718d 100644 --- a/tests/ovsdb-schema.at +++ b/tests/ovsdb-schema.at @@ -60,17 +60,17 @@ dnl Immutable weak references are forced to be mutable. OVSDB_CHECK_POSITIVE_CPY([schema with immutable weak references], [[parse-schema \ '{"name": "mydb", - "version": "4.2.1", - "tables": { - "a": { - "columns": { - "x": { - "type": { - "key": { - "type": "uuid", - "refTable": "a", - "refType": "weak"}}, - "mutable": false}}}}}']], + "version": "4.2.1", + "tables": { + "a": { + "columns": { + "x": { + "type": { + "key": { + "type": "uuid", + "refTable": "a", + "refType": "weak"}}, + "mutable": false}}}}}']], [[{"name":"mydb","tables":{"a":{"columns":{"x":{"type":{"key":{"refTable":"a","refType":"weak","type":"uuid"}}}}}},"version":"4.2.1"}]]) dnl Schemas without version numbers are accepted for backward diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index cbbccab5e..edffae1bc 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -532,7 +532,7 @@ AT_SKIP_IF([test "$HAVE_OPENSSL" = no]) # msys on Windows does not convert the path style automatically. # So, do that forcefully with a 'pwd -W' (called through pwd() function). PKIDIR="$(cd $abs_top_builddir/tests && pwd)" -AT_SKIP_IF([expr "$PKIDIR" : ".*[ '\" +AT_SKIP_IF([expr "$PKIDIR" : ".*[ '\" \\]"]) AT_DATA([schema], [[{"name": "mydb", @@ -657,9 +657,9 @@ ovsdb_check_online_compaction() { dnl than replacing the symlinks with regular files. mkdir dir if test "$IS_WIN32" = "no"; then - ln -s dir/db db - ln -s dir/.db.~lock~ .db.~lock~ - AT_SKIP_IF([test ! -h db || test ! -h .db.~lock~]) + ln -s dir/db db + ln -s dir/.db.~lock~ .db.~lock~ + AT_SKIP_IF([test ! -h db || test ! -h .db.~lock~]) fi AT_CHECK([if test $model = standalone; then ovsdb-tool create db schema @@ -673,33 +673,33 @@ ovsdb_check_online_compaction() { dnl Do a bunch of random transactions that put crap in the database log. AT_CHECK( [[for pair in 'zero 0' 'one 1' 'two 2' 'three 3' 'four 4' 'five 5'; do - set -- $pair - ovsdb-client transact unix:socket ' - ["ordinals", - {"op": "insert", - "table": "ordinals", - "row": {"name": "'$1'", "number": '$2'}}, - {"op": "comment", - "comment": "add row for '"$pair"'"}]' - ovsdb-client transact unix:socket ' - ["ordinals", - {"op": "delete", - "table": "ordinals", - "where": [["number", "==", '$2']]}, - {"op": "comment", - "comment": "delete row for '"$2"'"}]' - ovsdb-client transact unix:socket ' - ["ordinals", - {"op": "insert", - "table": "ordinals", - "row": {"name": "'$1'", "number": '$2'}}, - {"op": "comment", - "comment": "add back row for '"$pair"'"}]' - done]], + set -- $pair + ovsdb-client transact unix:socket ' + ["ordinals", + {"op": "insert", + "table": "ordinals", + "row": {"name": "'$1'", "number": '$2'}}, + {"op": "comment", + "comment": "add row for '"$pair"'"}]' + ovsdb-client transact unix:socket ' + ["ordinals", + {"op": "delete", + "table": "ordinals", + "where": [["number", "==", '$2']]}, + {"op": "comment", + "comment": "delete row for '"$2"'"}]' + ovsdb-client transact unix:socket ' + ["ordinals", + {"op": "insert", + "table": "ordinals", + "row": {"name": "'$1'", "number": '$2'}}, + {"op": "comment", + "comment": "add back row for '"$pair"'"}]' + done]], [0], [stdout]) if test $model = standalone; then - dnl Check that all the crap is in fact in the database log. - AT_CHECK([[uuidfilt db | grep -v ^OVSDB | sed 's/"_date":[0-9]*/"_date":0/' | ovstest test-json --multiple -]], [0], + dnl Check that all the crap is in fact in the database log. + AT_CHECK([[uuidfilt db | grep -v ^OVSDB | sed 's/"_date":[0-9]*/"_date":0/' | ovstest test-json --multiple -]], [0], [[{"cksum":"12345678 9","name":"ordinals","tables":{"ordinals":{"columns":{"name":{"type":"string"},"number":{"type":"integer"}},"indexes":[["number"]]}},"version":"5.1.3"} {"_comment":"add row for zero 0","_date":0,"ordinals":{"<0>":{"name":"zero"}}} {"_comment":"delete row for 0","_date":0,"ordinals":{"<0>":null}} @@ -722,7 +722,7 @@ ovsdb_check_online_compaction() { ]]) else dnl Check that at least there's a lot of transactions. - AT_CHECK([test `wc -l < db` -gt 50]) + AT_CHECK([test `wc -l < db` -gt 50]) fi dnl Dump out and check the actual database contents. AT_CHECK([ovsdb-client dump unix:socket ordinals], [0], [stdout]) @@ -749,10 +749,10 @@ ovs-appctl: ovsdb-server: server returned an error dnl Make sure that "db" is still a symlink to dir/db instead of getting dnl replaced by a regular file, ditto for .db.~lock~. if test "$IS_WIN32" = "no"; then - AT_CHECK([test -h db]) - AT_CHECK([test -h .db.~lock~]) - AT_CHECK([test -f dir/db]) - AT_CHECK([test -f dir/.db.~lock~]) + AT_CHECK([test -h db]) + AT_CHECK([test -h .db.~lock~]) + AT_CHECK([test -f dir/db]) + AT_CHECK([test -f dir/.db.~lock~]) fi # We can't fully re-check the contents of the database log, because the @@ -781,10 +781,10 @@ _uuid name number dnl Now do some more transactions. AT_CHECK( [[ovsdb-client transact unix:socket ' - ["ordinals", - {"op": "delete", - "table": "ordinals", - "where": [["number", "<", 3]]}]']], + ["ordinals", + {"op": "delete", + "table": "ordinals", + "where": [["number", "<", 3]]}]']], [0], [[[{"count":3}] ]], [ignore]) @@ -838,17 +838,17 @@ ovsdb_check_online_conversion() { [[{"name": "ordinals", "tables": { "ordinals": { - "columns": { - "number": {"type": "integer"}}}}} + "columns": { + "number": {"type": "integer"}}}}} ]]) dnl Make sure that "ovsdb-tool create" works with a dangling symlink for dnl the database and the lockfile, creating the target of each symlink dnl rather than replacing the symlinks with regular files. mkdir dir if test "$IS_WIN32" = "no"; then - ln -s dir/db db - ln -s dir/.db.~lock~ .db.~lock~ - AT_SKIP_IF([test ! -h db || test ! -h .db.~lock~]) + ln -s dir/db db + ln -s dir/.db.~lock~ .db.~lock~ + AT_SKIP_IF([test ! -h db || test ! -h .db.~lock~]) fi AT_CHECK([if test $model = standalone; then ovsdb-tool create db schema @@ -863,15 +863,15 @@ ovsdb_check_online_conversion() { dnl Put some data in the database. AT_CHECK( [[for pair in 'zero 0' 'one 1' 'two 2' 'three 3' 'four 4' 'five 5'; do - set -- $pair - ovsdb-client transact ' - ["ordinals", - {"op": "insert", - "table": "ordinals", - "row": {"name": "'$1'", "number": '$2'}}, - {"op": "comment", - "comment": "add row for '"$pair"'"}]' - done | uuidfilt]], [0], + set -- $pair + ovsdb-client transact ' + ["ordinals", + {"op": "insert", + "table": "ordinals", + "row": {"name": "'$1'", "number": '$2'}}, + {"op": "comment", + "comment": "add row for '"$pair"'"}]' + done | uuidfilt]], [0], [[[{"uuid":["uuid","<0>"]},{}] [{"uuid":["uuid","<1>"]},{}] [{"uuid":["uuid","<2>"]},{}] @@ -913,12 +913,12 @@ ovsdb_check_online_conversion() { dnl Start two long-running transactions (triggers) on the 'ordinals' db, dnl one that is database change aware and one that is not. ordinals_txn='[["ordinals", - {"op": "wait", - "table": "ordinals", - "where": [["name", "==", "seven"]], - "columns": ["name", "number"], - "rows": [], - "until": "!="}]]' + {"op": "wait", + "table": "ordinals", + "where": [["name", "==", "seven"]], + "columns": ["name", "number"], + "rows": [], + "until": "!="}]]' AT_CHECK([ovsdb-client -vfile -vvlog:off --detach --pidfile=trigger-ordinals-aware.pid --log-file=trigger-ordinals-aware.log --db-change-aware transact "$ordinals_txn" > trigger-ordinals-aware.stdout 2> trigger-ordinals-aware.stderr]) AT_CAPTURE_FILE([trigger-ordinals-aware.stdout]) AT_CAPTURE_FILE([trigger-ordinals-aware.log]) @@ -932,12 +932,12 @@ ovsdb_check_online_conversion() { dnl Start two long-running transactions (triggers) on the _Server db, dnl one that is database change aware and one that is not. server_txn='[["_Server", - {"op": "wait", - "table": "Database", - "where": [["name", "==", "xyzzy"]], - "columns": ["name"], - "rows": [], - "until": "!="}]]' + {"op": "wait", + "table": "Database", + "where": [["name", "==", "xyzzy"]], + "columns": ["name"], + "rows": [], + "until": "!="}]]' AT_CHECK([ovsdb-client -vfile -vvlog:off --detach --pidfile=trigger-server-aware.pid --log-file=trigger-server-aware.log --db-change-aware transact "$server_txn" > trigger-server-aware.stdout 2> trigger-server-aware.stderr]) AT_CAPTURE_FILE([trigger-server-aware.stdout]) AT_CAPTURE_FILE([trigger-server-aware.log]) @@ -974,9 +974,9 @@ _uuid name number dnl Verify that the "ordinals" monitors behaved as they should have. dnl Both should have exited, for different reasons. for x in aware unaware; do - echo $x - OVS_WAIT_WHILE([test -e monitor-ordinals-$x.pid]) - AT_CHECK([sort -k 3 monitor-ordinals-$x.stdout | uuidfilt], [0], + echo $x + OVS_WAIT_WHILE([test -e monitor-ordinals-$x.pid]) + AT_CHECK([sort -k 3 monitor-ordinals-$x.stdout | uuidfilt], [0], [<0> initial 0 zero <1> initial 1 one <2> initial 2 two @@ -993,7 +993,7 @@ _uuid name number dnl Verify that the _Server monitors behaved as they should have. dnl The db-aware monitor should still be running, but not the unaware one. for x in aware unaware; do - AT_CHECK([sort -k 3 monitor-server-$x.stdout | uuidfilt], [0], + AT_CHECK([sort -k 3 monitor-server-$x.stdout | uuidfilt], [0], [<0> initial _Server <1> initial ordinals ]) @@ -1006,8 +1006,8 @@ _uuid name number dnl Verify that the "ordinals" triggers behaved as they should have: dnl Both should have exited, for different reasons. for x in unaware aware; do - OVS_WAIT_WHILE([test -e trigger-ordinals-$x.pid]) - AT_CHECK([cat trigger-ordinals-$x.stdout]) + OVS_WAIT_WHILE([test -e trigger-ordinals-$x.pid]) + AT_CHECK([cat trigger-ordinals-$x.stdout]) done AT_CHECK([cat trigger-ordinals-unaware.stderr], [0], [ovsdb-client: transaction failed (End of file) ]) @@ -1017,7 +1017,7 @@ _uuid name number dnl Verify that the _Server triggers behaved as they should have: dnl The db-aware trigger should still be waiting, but not the unaware one. for x in aware unaware; do - AT_CHECK([cat trigger-server-$x.stdout]) + AT_CHECK([cat trigger-server-$x.stdout]) done OVS_WAIT_WHILE([test -e trigger-server-unaware.pid]) AT_CHECK([sed 's/.*: //' trigger-ordinals-unaware.stderr], [0], [transaction failed (End of file) @@ -1026,10 +1026,10 @@ _uuid name number AT_CAPTURE_FILE([db]) if test $model = standalone; then - dnl We can't fully re-check the contents of the database log, because the - dnl order of the records is not predictable, but there should only be 4 lines - dnl in it now. - AT_CHECK([test `wc -l < db` -eq 4]) + dnl We can't fully re-check the contents of the database log, because the + dnl order of the records is not predictable, but there should only be 4 lines + dnl in it now. + AT_CHECK([test `wc -l < db` -eq 4]) fi dnl Check that the dumped data is the same except for the removed column: AT_CHECK([ovsdb-client dump unix:db.sock ordinals | uuidfilt], [0], [dnl @@ -1048,12 +1048,12 @@ _uuid number dnl is as expected. AT_CHECK( [[ovsdb-client transact ' - ["ordinals", - {"op": "insert", - "table": "ordinals", - "row": {"number": 6}}, - {"op": "comment", - "comment": "add row for 6"}]' | uuidfilt]], [0], + ["ordinals", + {"op": "insert", + "table": "ordinals", + "row": {"number": 6}}, + {"op": "comment", + "comment": "add row for 6"}]' | uuidfilt]], [0], [[[{"uuid":["uuid","<0>"]},{}] ]]) if test $model = standalone; then @@ -1092,10 +1092,10 @@ _uuid number dnl Make sure that "db" is still a symlink to dir/db instead of getting dnl replaced by a regular file, ditto for .db.~lock~. if test "$IS_WIN32" = "no"; then - AT_CHECK([test -h db]) - AT_CHECK([test -h .db.~lock~]) - AT_CHECK([test -f dir/db]) - AT_CHECK([test -f dir/.db.~lock~]) + AT_CHECK([test -h db]) + AT_CHECK([test -h .db.~lock~]) + AT_CHECK([test -f dir/db]) + AT_CHECK([test -f dir/.db.~lock~]) fi OVS_APP_EXIT_AND_WAIT([ovsdb-server]) diff --git a/tests/ovsdb-tool.at b/tests/ovsdb-tool.at index a27a239ea..359d1f063 100644 --- a/tests/ovsdb-tool.at +++ b/tests/ovsdb-tool.at @@ -118,9 +118,9 @@ AT_CHECK([[uuidfilt db | grep -v ^OVSDB | sed 's/"_date":[0-9]*/"_date":0/' | ov dnl Dump out and check the actual database contents. on_exit 'kill `cat ovsdb-server.pid`' AT_CHECK([[ovsdb-server --detach --pidfile --no-chdir --remote=punix:socket db]], - [0], [stdout], [ignore]) + [0], [stdout], [ignore]) AT_CHECK([[ovsdb-client dump unix:socket ordinals]], - [0], [stdout], [ignore]) + [0], [stdout], [ignore]) OVS_APP_EXIT_AND_WAIT([ovsdb-server]) AT_CHECK([uuidfilt stdout], [0], [dnl @@ -151,9 +151,9 @@ AT_CAPTURE_FILE([db]) AT_CHECK([test `wc -l < db` -eq 4]) dnl And check that the dumped data is the same too: AT_CHECK([[ovsdb-server --detach --pidfile --no-chdir --remote=punix:socket db]], - [0], [stdout], [ignore]) + [0], [stdout], [ignore]) AT_CHECK([[ovsdb-client dump unix:socket ordinals]], - [0], [stdout], [ignore]) + [0], [stdout], [ignore]) OVS_APP_EXIT_AND_WAIT([ovsdb-server]) AT_CHECK([uuidfilt stdout], [0], [dnl @@ -427,12 +427,12 @@ AT_CHECK( [[for pair in 'zero 0' 'one 1' 'two 2' 'three 3' 'four 4' 'five 5'; do set -- $pair ovsdb-tool transact db1 ' - ["ordinals", - {"op": "insert", - "table": "ordinals", - "row": {"name": "'$1'", "number": '$2'}}, - {"op": "comment", - "comment": "add row for '"$pair"'"}]' + ["ordinals", + {"op": "insert", + "table": "ordinals", + "row": {"name": "'$1'", "number": '$2'}}, + {"op": "comment", + "comment": "add row for '"$pair"'"}]' done | uuidfilt]], [0], [[[{"uuid":["uuid","<0>"]},{}] [{"uuid":["uuid","<1>"]},{}] diff --git a/tests/pmd.at b/tests/pmd.at index 0c8829f49..f3fac6385 100644 --- a/tests/pmd.at +++ b/tests/pmd.at @@ -6,7 +6,7 @@ m4_divert_push([PREPARE_TESTS]) # of every rxq (one per line) in the form: # port_name rxq_id numa_id core_id parse_pmd_rxq_show () { - awk '/pmd thread/ {numa=$4; core=substr($6, 1, length($6) - 1)} /\tport:/ {print $2, $4, numa, core}' | sort + awk '/pmd thread/ {numa=$4; core=substr($6, 1, length($6) - 1)} /^ port:/ {print $2, $4, numa, core}' | sort } # Given the output of `ovs-appctl dpif-netdev/pmd-rxq-show`, @@ -72,8 +72,8 @@ CHECK_PMD_THREADS_CREATED() AT_CHECK([ovs-appctl dpif-netdev/pmd-rxq-show | sed SED_NUMA_CORE_PATTERN], [0], [dnl pmd thread numa_id <cleared> core_id <cleared>: - isolated : false - port: p0 queue-id: 0 pmd usage: NOT AVAIL + isolated : false + port: p0 queue-id: 0 pmd usage: NOT AVAIL ]) AT_CHECK([ovs-appctl dpif/show | sed 's/\(tx_queues=\)[[0-9]]*/\1<cleared>/g'], [0], [dnl @@ -103,15 +103,15 @@ dummy@ovs-dummy: hit:0 missed:0 AT_CHECK([ovs-appctl dpif-netdev/pmd-rxq-show | sed SED_NUMA_CORE_PATTERN], [0], [dnl pmd thread numa_id <cleared> core_id <cleared>: - isolated : false - port: p0 queue-id: 0 pmd usage: NOT AVAIL - port: p0 queue-id: 1 pmd usage: NOT AVAIL - port: p0 queue-id: 2 pmd usage: NOT AVAIL - port: p0 queue-id: 3 pmd usage: NOT AVAIL - port: p0 queue-id: 4 pmd usage: NOT AVAIL - port: p0 queue-id: 5 pmd usage: NOT AVAIL - port: p0 queue-id: 6 pmd usage: NOT AVAIL - port: p0 queue-id: 7 pmd usage: NOT AVAIL + isolated : false + port: p0 queue-id: 0 pmd usage: NOT AVAIL + port: p0 queue-id: 1 pmd usage: NOT AVAIL + port: p0 queue-id: 2 pmd usage: NOT AVAIL + port: p0 queue-id: 3 pmd usage: NOT AVAIL + port: p0 queue-id: 4 pmd usage: NOT AVAIL + port: p0 queue-id: 5 pmd usage: NOT AVAIL + port: p0 queue-id: 6 pmd usage: NOT AVAIL + port: p0 queue-id: 7 pmd usage: NOT AVAIL ]) OVS_VSWITCHD_STOP @@ -134,15 +134,15 @@ dummy@ovs-dummy: hit:0 missed:0 AT_CHECK([ovs-appctl dpif-netdev/pmd-rxq-show | sed SED_NUMA_CORE_PATTERN], [0], [dnl pmd thread numa_id <cleared> core_id <cleared>: - isolated : false - port: p0 queue-id: 0 pmd usage: NOT AVAIL - port: p0 queue-id: 1 pmd usage: NOT AVAIL - port: p0 queue-id: 2 pmd usage: NOT AVAIL - port: p0 queue-id: 3 pmd usage: NOT AVAIL - port: p0 queue-id: 4 pmd usage: NOT AVAIL - port: p0 queue-id: 5 pmd usage: NOT AVAIL - port: p0 queue-id: 6 pmd usage: NOT AVAIL - port: p0 queue-id: 7 pmd usage: NOT AVAIL + isolated : false + port: p0 queue-id: 0 pmd usage: NOT AVAIL + port: p0 queue-id: 1 pmd usage: NOT AVAIL + port: p0 queue-id: 2 pmd usage: NOT AVAIL + port: p0 queue-id: 3 pmd usage: NOT AVAIL + port: p0 queue-id: 4 pmd usage: NOT AVAIL + port: p0 queue-id: 5 pmd usage: NOT AVAIL + port: p0 queue-id: 6 pmd usage: NOT AVAIL + port: p0 queue-id: 7 pmd usage: NOT AVAIL ]) TMP=$(cat ovs-vswitchd.log | wc -l | tr -d [[:blank:]]) @@ -160,15 +160,15 @@ CHECK_PMD_THREADS_CREATED([1], [], [+$TMP]) AT_CHECK([ovs-appctl dpif-netdev/pmd-rxq-show | sed SED_NUMA_CORE_PATTERN], [0], [dnl pmd thread numa_id <cleared> core_id <cleared>: - isolated : false - port: p0 queue-id: 0 pmd usage: NOT AVAIL - port: p0 queue-id: 1 pmd usage: NOT AVAIL - port: p0 queue-id: 2 pmd usage: NOT AVAIL - port: p0 queue-id: 3 pmd usage: NOT AVAIL - port: p0 queue-id: 4 pmd usage: NOT AVAIL - port: p0 queue-id: 5 pmd usage: NOT AVAIL - port: p0 queue-id: 6 pmd usage: NOT AVAIL - port: p0 queue-id: 7 pmd usage: NOT AVAIL + isolated : false + port: p0 queue-id: 0 pmd usage: NOT AVAIL + port: p0 queue-id: 1 pmd usage: NOT AVAIL + port: p0 queue-id: 2 pmd usage: NOT AVAIL + port: p0 queue-id: 3 pmd usage: NOT AVAIL + port: p0 queue-id: 4 pmd usage: NOT AVAIL + port: p0 queue-id: 5 pmd usage: NOT AVAIL + port: p0 queue-id: 6 pmd usage: NOT AVAIL + port: p0 queue-id: 7 pmd usage: NOT AVAIL ]) OVS_VSWITCHD_STOP @@ -197,14 +197,14 @@ dummy@ovs-dummy: hit:0 missed:0 AT_CHECK([ovs-appctl dpif-netdev/pmd-stats-show | sed SED_NUMA_CORE_PATTERN | sed '/cycles/d' | grep pmd -A 8], [0], [dnl pmd thread numa_id <cleared> core_id <cleared>: - packets received: 0 - packet recirculations: 0 - avg. datapath passes per packet: 0.00 - emc hits: 0 - megaflow hits: 0 - avg. subtable lookups per megaflow hit: 0.00 - miss with success upcall: 0 - miss with failed upcall: 0 + packets received: 0 + packet recirculations: 0 + avg. datapath passes per packet: 0.00 + emc hits: 0 + megaflow hits: 0 + avg. subtable lookups per megaflow hit: 0.00 + miss with success upcall: 0 + miss with failed upcall: 0 ]) ovs-appctl time/stop @@ -227,14 +227,14 @@ recirc_id(0),in_port(1),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:77,dst=50: AT_CHECK([ovs-appctl dpif-netdev/pmd-stats-show | sed SED_NUMA_CORE_PATTERN | sed '/cycles/d' | grep pmd -A 8], [0], [dnl pmd thread numa_id <cleared> core_id <cleared>: - packets received: 20 - packet recirculations: 0 - avg. datapath passes per packet: 1.00 - emc hits: 19 - megaflow hits: 0 - avg. subtable lookups per megaflow hit: 0.00 - miss with success upcall: 1 - miss with failed upcall: 0 + packets received: 20 + packet recirculations: 0 + avg. datapath passes per packet: 1.00 + emc hits: 19 + megaflow hits: 0 + avg. subtable lookups per megaflow hit: 0.00 + miss with success upcall: 1 + miss with failed upcall: 0 ]) OVS_VSWITCHD_STOP diff --git a/tests/run-oftest b/tests/run-oftest index d5701d6c1..63d07c652 100755 --- a/tests/run-oftest +++ b/tests/run-oftest @@ -69,8 +69,8 @@ run ovs-vsctl --no-wait \ -- set bridge br0 datapath-type=dummy fail-mode=secure for port in p1 p2 p3 p4; do run ovs-vsctl --no-wait \ - -- add-port br0 $port \ - -- set interface $port type=dummy \ + -- add-port br0 $port \ + -- set interface $port type=dummy \ options:pstream=punix:$OVS_RUNDIR/$port done run ovs-vsctl \ @@ -84,9 +84,9 @@ cat <<EOF ---------------------------------------------------------------------- Logs may be found under $sandbox, e.g.: - $sandbox/oft.log - $sandbox/ovs-vswitchd.log - $sandbox/ovsdb-server.log + $sandbox/oft.log + $sandbox/ovs-vswitchd.log + $sandbox/ovsdb-server.log ---------------------------------------------------------------------- EOF diff --git a/tests/run-ryu b/tests/run-ryu index 2aea14db5..fedf73d94 100755 --- a/tests/run-ryu +++ b/tests/run-ryu @@ -81,7 +81,7 @@ do -- set controller $bridge connection-mode=out-of-band \ max-backoff=1000 \ -- add-port $bridge $port1 \ - -- set interface $port1 ofport_request=1 type=dummy \ + -- set interface $port1 ofport_request=1 type=dummy \ options:${stream_mode}:"$sandbox"/p1.sock \ -- add-port $bridge $port2 \ -- set interface $port2 ofport_request=2 type=dummy \ @@ -144,7 +144,7 @@ cat <<EOF ---------------------------------------------------------------------- Logs may be found under $sandbox, e.g.:$logs - $sandbox/ovs-vswitchd.log - $sandbox/ovsdb-server.log + $sandbox/ovs-vswitchd.log + $sandbox/ovsdb-server.log ---------------------------------------------------------------------- EOF diff --git a/tests/test-lib.c b/tests/test-lib.c index 059dd04ba..bcb5bb782 100644 --- a/tests/test-lib.c +++ b/tests/test-lib.c @@ -49,7 +49,7 @@ parse_options(int argc, char *argv[]) static const struct option long_options[] = { {"help", no_argument, NULL, 'h'}, {"version", no_argument, NULL, 'V'}, - {"verbose", optional_argument, NULL, 'v'}, + {"verbose", optional_argument, NULL, 'v'}, {NULL, 0, NULL, 0}, }; char *short_options = "hVv"; diff --git a/tests/test-sflow.c b/tests/test-sflow.c index 82e950273..460d4d6c5 100644 --- a/tests/test-sflow.c +++ b/tests/test-sflow.c @@ -113,16 +113,16 @@ struct sflow_xdr { struct { uint32_t HEADER; uint32_t SWITCH; - uint32_t TUNNEL4_OUT; - uint32_t TUNNEL4_IN; - uint32_t TUNNEL_VNI_OUT; - uint32_t TUNNEL_VNI_IN; - uint32_t MPLS; - uint32_t IFCOUNTERS; - uint32_t ETHCOUNTERS; - uint32_t LACPCOUNTERS; - uint32_t OPENFLOWPORT; - uint32_t PORTNAME; + uint32_t TUNNEL4_OUT; + uint32_t TUNNEL4_IN; + uint32_t TUNNEL_VNI_OUT; + uint32_t TUNNEL_VNI_IN; + uint32_t MPLS; + uint32_t IFCOUNTERS; + uint32_t ETHCOUNTERS; + uint32_t LACPCOUNTERS; + uint32_t OPENFLOWPORT; + uint32_t PORTNAME; } offset; /* Flow sample fields. */ @@ -245,39 +245,39 @@ process_counter_sample(struct sflow_xdr *x) printf("\n"); } if (x->offset.LACPCOUNTERS) { - struct eth_addr *mac; - union { - ovs_be32 all; - struct { - uint8_t actorAdmin; - uint8_t actorOper; - uint8_t partnerAdmin; - uint8_t partnerOper; - } v; - } state; + struct eth_addr *mac; + union { + ovs_be32 all; + struct { + uint8_t actorAdmin; + uint8_t actorOper; + uint8_t partnerAdmin; + uint8_t partnerOper; + } v; + } state; sflowxdr_setc(x, x->offset.LACPCOUNTERS); printf("LACPCOUNTERS"); - mac = (void *)sflowxdr_str(x); - printf(" sysID="ETH_ADDR_FMT, ETH_ADDR_ARGS(*mac)); - sflowxdr_skip(x, 2); - mac = (void *)sflowxdr_str(x); - printf(" partnerID="ETH_ADDR_FMT, ETH_ADDR_ARGS(*mac)); - sflowxdr_skip(x, 2); - printf(" aggID=%"PRIu32, sflowxdr_next(x)); - state.all = sflowxdr_next_n(x); - printf(" actorAdmin=0x%"PRIx32, state.v.actorAdmin); - printf(" actorOper=0x%"PRIx32, state.v.actorOper); - printf(" partnerAdmin=0x%"PRIx32, state.v.partnerAdmin); - printf(" partnerOper=0x%"PRIx32, state.v.partnerOper); - printf(" LACPDUsRx=%"PRIu32, sflowxdr_next(x)); - printf(" markerPDUsRx=%"PRIu32, sflowxdr_next(x)); - printf(" markerRespPDUsRx=%"PRIu32, sflowxdr_next(x)); - printf(" unknownRx=%"PRIu32, sflowxdr_next(x)); - printf(" illegalRx=%"PRIu32, sflowxdr_next(x)); - printf(" LACPDUsTx=%"PRIu32, sflowxdr_next(x)); - printf(" markerPDUsTx=%"PRIu32, sflowxdr_next(x)); - printf(" markerRespPDUsTx=%"PRIu32, sflowxdr_next(x)); + mac = (void *)sflowxdr_str(x); + printf(" sysID="ETH_ADDR_FMT, ETH_ADDR_ARGS(*mac)); + sflowxdr_skip(x, 2); + mac = (void *)sflowxdr_str(x); + printf(" partnerID="ETH_ADDR_FMT, ETH_ADDR_ARGS(*mac)); + sflowxdr_skip(x, 2); + printf(" aggID=%"PRIu32, sflowxdr_next(x)); + state.all = sflowxdr_next_n(x); + printf(" actorAdmin=0x%"PRIx32, state.v.actorAdmin); + printf(" actorOper=0x%"PRIx32, state.v.actorOper); + printf(" partnerAdmin=0x%"PRIx32, state.v.partnerAdmin); + printf(" partnerOper=0x%"PRIx32, state.v.partnerOper); + printf(" LACPDUsRx=%"PRIu32, sflowxdr_next(x)); + printf(" markerPDUsRx=%"PRIu32, sflowxdr_next(x)); + printf(" markerRespPDUsRx=%"PRIu32, sflowxdr_next(x)); + printf(" unknownRx=%"PRIu32, sflowxdr_next(x)); + printf(" illegalRx=%"PRIu32, sflowxdr_next(x)); + printf(" LACPDUsTx=%"PRIu32, sflowxdr_next(x)); + printf(" markerPDUsTx=%"PRIu32, sflowxdr_next(x)); + printf(" markerRespPDUsTx=%"PRIu32, sflowxdr_next(x)); printf("\n"); } if (x->offset.OPENFLOWPORT) { @@ -285,21 +285,21 @@ process_counter_sample(struct sflow_xdr *x) printf("OPENFLOWPORT"); printf(" datapath_id=%"PRIu64, sflowxdr_next_int64(x)); printf(" port_no=%"PRIu32, sflowxdr_next(x)); - printf("\n"); + printf("\n"); } if (x->offset.PORTNAME) { - uint32_t pnLen; - const char *pnBytes; - char portName[SFL_MAX_PORTNAME_LEN + 1]; + uint32_t pnLen; + const char *pnBytes; + char portName[SFL_MAX_PORTNAME_LEN + 1]; sflowxdr_setc(x, x->offset.PORTNAME); printf("PORTNAME"); - pnLen = sflowxdr_next(x); - SFLOWXDR_assert(x, (pnLen <= SFL_MAX_PORTNAME_LEN)); - pnBytes = sflowxdr_str(x); - memcpy(portName, pnBytes, pnLen); - portName[pnLen] = '\0'; - printf(" portName=%s", portName); - printf("\n"); + pnLen = sflowxdr_next(x); + SFLOWXDR_assert(x, (pnLen <= SFL_MAX_PORTNAME_LEN)); + pnBytes = sflowxdr_str(x); + memcpy(portName, pnBytes, pnLen); + portName[pnLen] = '\0'; + printf(" portName=%s", portName); + printf("\n"); } if (x->offset.ETHCOUNTERS) { sflowxdr_setc(x, x->offset.ETHCOUNTERS); @@ -386,22 +386,22 @@ process_flow_sample(struct sflow_xdr *x) if (x->offset.TUNNEL4_IN) { sflowxdr_setc(x, x->offset.TUNNEL4_IN); - print_struct_ipv4(x, "tunnel4_in"); + print_struct_ipv4(x, "tunnel4_in"); } if (x->offset.TUNNEL4_OUT) { sflowxdr_setc(x, x->offset.TUNNEL4_OUT); - print_struct_ipv4(x, "tunnel4_out"); + print_struct_ipv4(x, "tunnel4_out"); } if (x->offset.TUNNEL_VNI_IN) { sflowxdr_setc(x, x->offset.TUNNEL_VNI_IN); - printf( " tunnel_in_vni=%"PRIu32, sflowxdr_next(x)); + printf( " tunnel_in_vni=%"PRIu32, sflowxdr_next(x)); } if (x->offset.TUNNEL_VNI_OUT) { sflowxdr_setc(x, x->offset.TUNNEL_VNI_OUT); - printf( " tunnel_out_vni=%"PRIu32, sflowxdr_next(x)); + printf( " tunnel_out_vni=%"PRIu32, sflowxdr_next(x)); } if (x->offset.MPLS) { @@ -616,23 +616,23 @@ process_datagram(struct sflow_xdr *x) sflowxdr_mark_unique(x, &x->offset.SWITCH); break; - case SFLOW_TAG_PKT_TUNNEL4_OUT: + case SFLOW_TAG_PKT_TUNNEL4_OUT: sflowxdr_mark_unique(x, &x->offset.TUNNEL4_OUT); break; - case SFLOW_TAG_PKT_TUNNEL4_IN: + case SFLOW_TAG_PKT_TUNNEL4_IN: sflowxdr_mark_unique(x, &x->offset.TUNNEL4_IN); break; - case SFLOW_TAG_PKT_TUNNEL_VNI_OUT: + case SFLOW_TAG_PKT_TUNNEL_VNI_OUT: sflowxdr_mark_unique(x, &x->offset.TUNNEL_VNI_OUT); break; - case SFLOW_TAG_PKT_TUNNEL_VNI_IN: + case SFLOW_TAG_PKT_TUNNEL_VNI_IN: sflowxdr_mark_unique(x, &x->offset.TUNNEL_VNI_IN); break; - case SFLOW_TAG_PKT_MPLS: + case SFLOW_TAG_PKT_MPLS: sflowxdr_mark_unique(x, &x->offset.MPLS); break; diff --git a/tests/tunnel.at b/tests/tunnel.at index c8fc2f7ac..ae379db12 100644 --- a/tests/tunnel.at +++ b/tests/tunnel.at @@ -662,10 +662,10 @@ AT_CHECK([ovs-ofctl add-tlv-map br0 "{class=0xffff,type=2,len=124}->tun_metadata [OFPT_ERROR (xid=0x4): NXTTMFC_TABLE_FULL NXT_TLV_TABLE_MOD (xid=0x4): ADD mapping table: - class type length match field - ----- ---- ------ ----------- - 0xffff 0x2 124 tun_metadata2 - 0xffff 0x3 124 tun_metadata3 + class type length match field + ------ ---- ------ -------------- + 0xffff 0x2 124 tun_metadata2 + 0xffff 0x3 124 tun_metadata3 ]) AT_CHECK([ovs-ofctl add-flow br0 "tun_metadata0,tun_metadata0,actions=drop"], [1], [ignore], @@ -723,9 +723,9 @@ AT_CHECK([ovs-ofctl del-tlv-map br0 "{class=0xffff,type=3,len=4}->tun_metadata2" OFPT_ERROR (xid=0x4): NXTTMFC_INVALID_TLV_DEL NXT_TLV_TABLE_MOD (xid=0x4): DEL mapping table: - class type length match field - ----- ---- ------ ----------- - 0xffff 0x3 4 tun_metadata2 + class type length match field + ------ ---- ------ -------------- + 0xffff 0x3 4 tun_metadata2 ]) AT_CHECK([ovs-ofctl del-flows br0], [0]) @@ -748,9 +748,9 @@ AT_CHECK([ovs-ofctl del-tlv-map br0 "{class=0xffff,type=1,len=4}->tun_metadata1" OFPT_ERROR (xid=0x4): NXTTMFC_INVALID_TLV_DEL NXT_TLV_TABLE_MOD (xid=0x4): DEL mapping table: - class type length match field - ----- ---- ------ ----------- - 0xffff 0x1 4 tun_metadata1 + class type length match field + ------ ---- ------ -------------- + 0xffff 0x1 4 tun_metadata1 ]) AT_CHECK([ovs-ofctl del-flows br0 "tun_metadata1"]) AT_CHECK([ovs-ofctl del-tlv-map br0 "{class=0xffff,type=1,len=4}->tun_metadata1"]) @@ -759,9 +759,9 @@ AT_CHECK([ovs-ofctl del-tlv-map br0 "{class=0xffff,type=2,len=4}->tun_metadata2" OFPT_ERROR (xid=0x4): NXTTMFC_INVALID_TLV_DEL NXT_TLV_TABLE_MOD (xid=0x4): DEL mapping table: - class type length match field - ----- ---- ------ ----------- - 0xffff 0x2 4 tun_metadata2 + class type length match field + ------ ---- ------ -------------- + 0xffff 0x2 4 tun_metadata2 ]) AT_CHECK([ovs-ofctl del-flows br0 "reg1=0xFF"]) AT_CHECK([ovs-ofctl del-tlv-map br0], [0]) |