Here's an updated version. I realized that I didn't need to omit the state
flags as I was revising this. This incremental reflects that change.
---
tests/lacp.at | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/tests/lacp.at b/tests/lacp.at
index 27e0f94..eff0c07 100644
--- a/tests/lacp.at
+++ b/tests/lacp.at
@@ -7,7 +7,7 @@ OVS_VSWITCHD_START([\
set Interface p1 type=dummy ])
AT_CHECK([ovs-appctl lacp/show], [0], [stdout])
-AT_CHECK([cat stdout | sed -e 's/state:.*/state: <omitted>/' -e 's/\t/ /'],
[0], [dnl
+AT_CHECK([sed -e 's/\t/ /' < stdout], [0], [dnl
---- p1 ----
status: active negotiated
sys_id: aa:55:aa:55:00:00
@@ -24,14 +24,14 @@ slave: p1: expired attached
actor port_id: 1
actor port_priority: 65535
actor key: 1
- actor state: <omitted>
+ actor state: activity synchronized collecting distributing expired
partner sys_id: 00:00:00:00:00:00
partner sys_priority: 0
partner port_id: 0
partner port_priority: 0
partner key: 0
- partner state: <omitted>
+ partner state: timeout
])
OVS_VSWITCHD_STOP
AT_CLEANUP
@@ -53,11 +53,9 @@ OVS_VSWITCHD_START([dnl
other_config:lacp-aggregation-key=3333 ])
AT_CHECK([ovs-appctl lacp/show], [0], [stdout])
-AT_CHECK([cat stdout | sed \
--e 's/state:.*/state: <omitted>/' \
+AT_CHECK([sed \
-e 's/aggregation key:.*/aggregation key: <omitted>/' \
--e 's/\t/ /'
-], [0], [dnl
+-e 's/\t/ /' < stdout], [0], [dnl
---- bond ----
status: active negotiated
sys_id: 11:22:33:44:55:66
@@ -74,14 +72,14 @@ slave: p1: expired attached
actor port_id: 11
actor port_priority: 111
actor key: 3333
- actor state: <omitted>
+ actor state: activity timeout aggregation synchronized collecting
distributing expired
partner sys_id: 00:00:00:00:00:00
partner sys_priority: 0
partner port_id: 0
partner port_priority: 0
partner key: 0
- partner state: <omitted>
+ partner state: timeout
slave: p2: expired attached
port_id: 22
@@ -92,14 +90,14 @@ slave: p2: expired attached
actor port_id: 22
actor port_priority: 222
actor key: 3333
- actor state: <omitted>
+ actor state: activity timeout aggregation synchronized collecting
distributing expired
partner sys_id: 00:00:00:00:00:00
partner sys_priority: 0
partner port_id: 0
partner port_priority: 0
partner key: 0
- partner state: <omitted>
+ partner state: timeout
])
OVS_VSWITCHD_STOP
AT_CLEANUP
--
1.7.7.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
