aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2010-01-27 14:28:30 -0800
committerBen Pfaff <blp@nicira.com>2010-01-27 14:28:30 -0800
commite328faadc42cb835b1adf1ef4d77a42c76b52f3f (patch)
treef67dbf2dc1152acc3c4b26e9522d8601aa72a402 /tests
parent987ae961590b56f1526a17d3bb15c38fd5e9caf9 (diff)
ovs-vsctl: Drop redundant {port,iface}-{set,get}-external-ids commands.
These commands can be implemented just as well, and in a more general-purpose way, using the "set", "remove", and "get" commands. The br-{get,set}-external-ids commands have slightly more specialized behavior and so we can't drop them (yet).
Diffstat (limited to 'tests')
-rw-r--r--tests/ovs-vsctl.at32
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at
index 8f8354ab..b7b37f98 100644
--- a/tests/ovs-vsctl.at
+++ b/tests/ovs-vsctl.at
@@ -286,10 +286,10 @@ AT_CHECK([RUN_OVS_VSCTL_TOGETHER(
[add-port a a1],
[add-bond a bond0 a2 a3],
[br-set-external-id a key0 value0],
- [port-set-external-id a1 key1 value1],
- [iface-set-external-id a2 key2 value2],
- [iface-set-external-id a2 key3 value3],
- [iface-set-external-id a3 key4 value4],
+ [set port a1 external-ids:key1=value1],
+ [set interface a2 external-ids:key2=value2],
+ [set interface a2 external-ids:key3=value3],
+ [set interface a3 external-ids:key4=value4],
[br-get-external-id a],
[br-get-external-id a key0],
[br-get-external-id a key1],
@@ -297,9 +297,9 @@ AT_CHECK([RUN_OVS_VSCTL_TOGETHER(
[br-get-external-id a],
[br-set-external-id a key0],
[br-get-external-id a],
- [port-get-external-id a1],
- [iface-get-external-id a2],
- [iface-get-external-id a3])], [0], [
+ [get port a1 external-ids],
+ [get interface a2 external-ids],
+ [get interface a3 external-ids])], [0], [
@@ -314,19 +314,19 @@ value0
key0=othervalue
-key1=value1
-key2=value2\nkey3=value3
-key4=value4
+{"key1"="value1"}
+{"key2"="value2", "key3"="value3"}
+{"key4"="value4"}
], [], [OVS_VSCTL_CLEANUP])
AT_CHECK([RUN_OVS_VSCTL_TOGETHER(
[br-get-external-id a],
- [port-get-external-id a1],
- [iface-get-external-id a2],
- [iface-get-external-id a3])], [0],
+ [get port a1 external-ids],
+ [get interface a2 external-ids],
+ [get interface a3 external-ids])], [0],
[
-key1=value1
-key2=value2\nkey3=value3
-key4=value4
+{"key1"="value1"}
+{"key2"="value2", "key3"="value3"}
+{"key4"="value4"}
], [], [OVS_VSCTL_CLEANUP])
CHECK_BRIDGES([a, a, 0])
CHECK_PORTS([a], [a1], [bond0])