[ovs-dev] [Single DP 09/15] tests: Rewrite unit tests to not expect bridge with odp zero.

Justin Pettit jpettit at nicira.com
Thu Oct 18 19:51:54 UTC 2012


A future commit will make all bridges of a particular type share a
single backing datapath.  That backing datapath will have a datapath
port number of zero and bridges will be assigned other numbers.  This
commit modifies the tests so that they don't expect port zero.

It adopts the convention that bridges of type "dummy" with a name of the
form "test-br<n>" will be assigned a port number of 100+<n>.

Signed-off-by: Justin Pettit <jpettit at nicira.com>
---
 lib/dpif-netdev.c          |   80 +++++----
 tests/lacp.at              |    4 +-
 tests/learn.at             |   88 ++++++----
 tests/ofproto-dpif.at      |  433 ++++++++++++++++++++++----------------------
 tests/ofproto-macros.at    |    4 +-
 tests/ofproto.at           |  376 +++++++++++++++++++-------------------
 tests/ovs-monitor-ipsec.at |    8 +-
 tests/ovs-ofctl.at         |   52 +++---
 tests/ovs-vsctl.at         |  314 ++++++++++++++++----------------
 tests/ovsdb-row.at         |    4 +-
 10 files changed, 699 insertions(+), 664 deletions(-)

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index fbb0833..5e9be17 100644
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -198,10 +198,50 @@ create_dpif_netdev(struct dp_netdev *dp)
 }
 
 static int
+choose_port(struct dp_netdev *dp, const char *name)
+{
+    int port_no;
+
+    if (dp->class != &dpif_netdev_class) {
+        const char *p;
+        int start_no = 0;
+
+        /* If the port name begins with "test-br", start the number
+         * search at 100 to make writing tests easier. */
+        if (!strncmp(name, "test-br", 7)) {
+            start_no = 100;
+        }
+
+        /* If the port name contains a number, try to assign that port number.
+         * This can make writing unit tests easier because port numbers are
+         * predictable. */
+        for (p = name; *p != '\0'; p++) {
+            if (isdigit((unsigned char) *p)) {
+                port_no = start_no + strtol(p, NULL, 10);
+                if (port_no > 0 && port_no < MAX_PORTS
+                    && !dp->ports[port_no]) {
+                    return port_no;
+                }
+                break;
+            }
+        }
+    }
+
+    for (port_no = 1; port_no < MAX_PORTS; port_no++) {
+        if (!dp->ports[port_no]) {
+            return port_no;
+        }
+    }
+
+    return -1;
+}
+
+static int
 create_dp_netdev(const char *name, const struct dpif_class *class,
                  struct dp_netdev **dpp)
 {
     struct dp_netdev *dp;
+    int port_no;
     int error;
     int i;
 
@@ -214,7 +254,10 @@ create_dp_netdev(const char *name, const struct dpif_class *class,
     }
     hmap_init(&dp->flow_table);
     list_init(&dp->port_list);
-    error = do_add_port(dp, name, "internal", OVSP_LOCAL);
+
+    port_no = !strncmp(name, "test-br", 7) ?
+                        choose_port(dp, name) :OVSP_LOCAL;
+    error = do_add_port(dp, name, "internal", port_no);
     if (error) {
         dp_netdev_free(dp);
         return error;
@@ -371,39 +414,6 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type,
 }
 
 static int
-choose_port(struct dpif *dpif, struct netdev *netdev)
-{
-    struct dp_netdev *dp = get_dp_netdev(dpif);
-    int port_no;
-
-    if (dpif->dpif_class != &dpif_netdev_class) {
-        /* If the port name contains a number, try to assign that port number.
-         * This can make writing unit tests easier because port numbers are
-         * predictable. */
-        const char *p;
-
-        for (p = netdev_get_name(netdev); *p != '\0'; p++) {
-            if (isdigit((unsigned char) *p)) {
-                port_no = strtol(p, NULL, 10);
-                if (port_no > 0 && port_no < MAX_PORTS
-                    && !dp->ports[port_no]) {
-                    return port_no;
-                }
-                break;
-            }
-        }
-    }
-
-    for (port_no = 0; port_no < MAX_PORTS; port_no++) {
-        if (!dp->ports[port_no]) {
-            return port_no;
-        }
-    }
-
-    return -1;
-}
-
-static int
 dpif_netdev_port_add(struct dpif *dpif, struct netdev *netdev,
                      uint32_t *port_nop)
 {
@@ -418,7 +428,7 @@ dpif_netdev_port_add(struct dpif *dpif, struct netdev *netdev,
         }
         port_no = *port_nop;
     } else {
-        port_no = choose_port(dpif, netdev);
+        port_no = choose_port(dp, netdev_get_name(netdev));
     }
     if (port_no >= 0) {
         *port_nop = port_no;
diff --git a/tests/lacp.at b/tests/lacp.at
index 7d96143..2c6f925 100644
--- a/tests/lacp.at
+++ b/tests/lacp.at
@@ -2,7 +2,7 @@ AT_BANNER([lacp])
 
 AT_SETUP([lacp - config])
 OVS_VSWITCHD_START([\
-        add-port br0 p1 --\
+        add-port test-br0 p1 --\
         set Port p1 lacp=active --\
         set Interface p1 type=dummy ])
 
@@ -39,7 +39,7 @@ AT_CLEANUP
 
 AT_SETUP([lacp - multi port config])
 OVS_VSWITCHD_START([dnl
-        add-bond br0 bond p1 p2 --\
+        add-bond test-br0 bond p1 p2 --\
         set Port bond lacp=active \
             other_config:lacp-time="fast" \
             other_config:lacp-system-id=11:22:33:44:55:66 \
diff --git a/tests/learn.at b/tests/learn.at
index da82f51..aec82be 100644
--- a/tests/learn.at
+++ b/tests/learn.at
@@ -61,23 +61,28 @@ AT_CLEANUP
 
 AT_SETUP([learning action - standard VLAN+MAC learning])
 OVS_VSWITCHD_START(
-  [add-port br0 eth0 -- set Interface eth0 type=dummy -- \
-   add-port br0 eth1 -- set Interface eth1 type=dummy -- \
-   add-port br0 eth2 -- set Interface eth2 type=dummy])
+  [add-port test-br0 p1 -- set Interface p1 type=dummy ofport_request=1 -- \
+   add-port test-br0 p2 -- set Interface p2 type=dummy ofport_request=2 -- \
+   add-port test-br0 p3 -- set Interface p3 type=dummy ofport_request=3])
 # Set up flow table for VLAN+MAC learning.
 AT_DATA([flows.txt], [[
 table=0 actions=learn(table=1, hard_timeout=60, NXM_OF_VLAN_TCI[0..11], NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[], output:NXM_OF_IN_PORT[]), resubmit(,1)
 table=1 priority=0 actions=flood
 ]])
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
 
 # Trace an ARP packet arriving on port 3, to create a MAC learning entry.
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(3),eth(src=50:54:00:00:00:05,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=192.168.0.1,tip=192.168.0.2,op=1,sha=50:54:00:00:00:05,tha=00:00:00:00:00:00)' -generate], [0], [stdout])
-AT_CHECK([tail -1 stdout], [0], [Datapath actions: 2,0,1
-])
+flow="in_port(3),eth(src=50:54:00:00:00:05,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=192.168.0.1,tip=192.168.0.2,op=1,sha=50:54:00:00:00:05,tha=00:00:00:00:00:00)"
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow" -generate], [0], [stdout])
+actual=`tail -1 stdout | sed 's/Datapath actions: //'`
+
+expected="1,2,100"
+AT_CHECK([ovs-dpctl normalize-actions "$flow" "$expected"], [0], [stdout])
+mv stdout expout
+AT_CHECK([ovs-dpctl normalize-actions "$flow" "$actual"], [0], [expout])
 
 # Check for the MAC learning entry.
-AT_CHECK([ovs-ofctl dump-flows br0 table=1 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl dump-flows test-br0 table=1 | ofctl_strip | sort], [0], [dnl
  table=1, hard_timeout=60, vlan_tci=0x0000/0x0fff,dl_dst=50:54:00:00:00:05 actions=output:3
  table=1, priority=0 actions=FLOOD
 NXST_FLOW reply:
@@ -85,12 +90,12 @@ NXST_FLOW reply:
 
 # Trace a packet arrival destined for the learned MAC.
 # (This will also learn a MAC.)
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(1),eth(src=50:54:00:00:00:06,dst=50:54:00:00:00:05),eth_type(0x0806),arp(sip=192.168.0.2,tip=192.168.0.1,op=2,sha=50:54:00:00:00:06,tha=50:54:00:00:00:05)' -generate], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port(1),eth(src=50:54:00:00:00:06,dst=50:54:00:00:00:05),eth_type(0x0806),arp(sip=192.168.0.2,tip=192.168.0.1,op=2,sha=50:54:00:00:00:06,tha=50:54:00:00:00:05)' -generate], [0], [stdout])
 AT_CHECK([tail -1 stdout], [0], [Datapath actions: 3
 ])
 
 # Check for both MAC learning entries.
-AT_CHECK([ovs-ofctl dump-flows br0 table=1 | ofctl_strip |sort], [0], [dnl
+AT_CHECK([ovs-ofctl dump-flows test-br0 table=1 | ofctl_strip |sort], [0], [dnl
  table=1, hard_timeout=60, vlan_tci=0x0000/0x0fff,dl_dst=50:54:00:00:00:05 actions=output:3
  table=1, hard_timeout=60, vlan_tci=0x0000/0x0fff,dl_dst=50:54:00:00:00:06 actions=output:1
  table=1, priority=0 actions=FLOOD
@@ -98,12 +103,17 @@ NXST_FLOW reply:
 ])
 
 # Trace a packet arrival that updates the first learned MAC entry.
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(2),eth(src=50:54:00:00:00:05,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=192.168.0.1,tip=192.168.0.2,op=1,sha=50:54:00:00:00:05,tha=00:00:00:00:00:00)' -generate], [0], [stdout])
-AT_CHECK([tail -1 stdout], [0], [Datapath actions: 3,0,1
-])
+flow="in_port(2),eth(src=50:54:00:00:00:05,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=192.168.0.1,tip=192.168.0.2,op=1,sha=50:54:00:00:00:05,tha=00:00:00:00:00:00)"
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow" -generate], [0], [stdout])
+actual=`tail -1 stdout | sed 's/Datapath actions: //'`
+
+expected="1,3,100"
+AT_CHECK([ovs-dpctl normalize-actions "$flow" "$expected"], [0], [stdout])
+mv stdout expout
+AT_CHECK([ovs-dpctl normalize-actions "$flow" "$actual"], [0], [expout])
 
 # Check that the MAC learning entry was updated.
-AT_CHECK([ovs-ofctl dump-flows br0 table=1 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl dump-flows test-br0 table=1 | ofctl_strip | sort], [0], [dnl
  table=1, hard_timeout=60, vlan_tci=0x0000/0x0fff,dl_dst=50:54:00:00:00:05 actions=output:2
  table=1, hard_timeout=60, vlan_tci=0x0000/0x0fff,dl_dst=50:54:00:00:00:06 actions=output:1
  table=1, priority=0 actions=FLOOD
@@ -114,19 +124,24 @@ AT_CLEANUP
 
 AT_SETUP([learning action - TCPv4 port learning])
 OVS_VSWITCHD_START(
-  [add-port br0 eth0 -- set Interface eth0 type=dummy -- \
-   add-port br0 eth1 -- set Interface eth1 type=dummy -- \
-   add-port br0 eth2 -- set Interface eth2 type=dummy])
+  [add-port test-br0 p1 -- set Interface p1 type=dummy -- \
+   add-port test-br0 p2 -- set Interface p2 type=dummy -- \
+   add-port test-br0 p3 -- set Interface p3 type=dummy])
 # Set up flow table for TCPv4 port learning.
-AT_CHECK([[ovs-ofctl add-flow br0 'table=0 tcp actions=learn(table=1, hard_timeout=60, eth_type=0x800, nw_proto=6, NXM_OF_IP_SRC[]=NXM_OF_IP_DST[], NXM_OF_IP_DST[]=NXM_OF_IP_SRC[], NXM_OF_TCP_SRC[]=NXM_OF_TCP_DST[], NXM_OF_TCP_DST[]=NXM_OF_TCP_SRC[]), flood']])
+AT_CHECK([[ovs-ofctl add-flow test-br0 'table=0 tcp actions=learn(table=1, hard_timeout=60, eth_type=0x800, nw_proto=6, NXM_OF_IP_SRC[]=NXM_OF_IP_DST[], NXM_OF_IP_DST[]=NXM_OF_IP_SRC[], NXM_OF_TCP_SRC[]=NXM_OF_TCP_DST[], NXM_OF_TCP_DST[]=NXM_OF_TCP_SRC[]), flood']])
 
 # Trace a TCPv4 packet arriving on port 3.
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(3),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:06),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=40000,dst=80)' -generate], [0], [stdout])
-AT_CHECK([tail -1 stdout], [0], [Datapath actions: 2,0,1
-])
+flow="in_port(3),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:06),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=40000,dst=80)"
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow" -generate], [0], [stdout])
+actual=`tail -1 stdout | sed 's/Datapath actions: //'`
+
+expected="1,2,100"
+AT_CHECK([ovs-dpctl normalize-actions "$flow" "$expected"], [0], [stdout])
+mv stdout expout
+AT_CHECK([ovs-dpctl normalize-actions "$flow" "$actual"], [0], [expout])
 
 # Check for the learning entry.
-AT_CHECK([ovs-ofctl dump-flows br0 table=1 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl dump-flows test-br0 table=1 | ofctl_strip | sort], [0], [dnl
  table=1, hard_timeout=60, tcp,nw_src=192.168.0.1,nw_dst=192.168.0.2,tp_src=80,tp_dst=40000 actions=drop
 NXST_FLOW reply:
 ])
@@ -135,21 +150,26 @@ AT_CLEANUP
 
 AT_SETUP([learning action - TCPv6 port learning])
 OVS_VSWITCHD_START(
-  [add-port br0 eth0 -- set Interface eth0 type=dummy -- \
-   add-port br0 eth1 -- set Interface eth1 type=dummy -- \
-   add-port br0 eth2 -- set Interface eth2 type=dummy])
+  [add-port test-br0 p1 -- set Interface p1 type=dummy -- \
+   add-port test-br0 p2 -- set Interface p2 type=dummy -- \
+   add-port test-br0 p3 -- set Interface p3 type=dummy])
 # Set up flow table for TCPv6 port learning.
 # Also add a 128-bit-wide "load" action and a 128-bit literal match to check
 # that they work.
-AT_CHECK([[ovs-ofctl add-flow br0 'table=0 tcp6 actions=learn(table=1, hard_timeout=60, eth_type=0x86dd, nw_proto=6, NXM_NX_IPV6_SRC[]=NXM_NX_IPV6_DST[], ipv6_dst=2001:0db8:85a3:0000:0000:8a2e:0370:7334, NXM_OF_TCP_SRC[]=NXM_OF_TCP_DST[], NXM_OF_TCP_DST[]=NXM_OF_TCP_SRC[], load(0x20010db885a308d313198a2e03707348->NXM_NX_IPV6_DST[])), flood']])
+AT_CHECK([[ovs-ofctl add-flow test-br0 'table=0 tcp6 actions=learn(table=1, hard_timeout=60, eth_type=0x86dd, nw_proto=6, NXM_NX_IPV6_SRC[]=NXM_NX_IPV6_DST[], ipv6_dst=2001:0db8:85a3:0000:0000:8a2e:0370:7334, NXM_OF_TCP_SRC[]=NXM_OF_TCP_DST[], NXM_OF_TCP_DST[]=NXM_OF_TCP_SRC[], load(0x20010db885a308d313198a2e03707348->NXM_NX_IPV6_DST[])), flood']])
 
 # Trace a TCPv6 packet arriving on port 3.
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(3),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:06),eth_type(0x86dd),ipv6(src=fec0::2,dst=fec0::1,label=0,proto=6,tclass=0,hlimit=255,frag=no),tcp(src=40000,dst=80)' -generate], [0], [stdout])
-AT_CHECK([tail -1 stdout], [0], [Datapath actions: 2,0,1
-])
+flow="in_port(3),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:06),eth_type(0x86dd),ipv6(src=fec0::2,dst=fec0::1,label=0,proto=6,tclass=0,hlimit=255,frag=no),tcp(src=40000,dst=80)"
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow" -generate], [0], [stdout])
+actual=`tail -1 stdout | sed 's/Datapath actions: //'`
+
+expected="1,2,100"
+AT_CHECK([ovs-dpctl normalize-actions "$flow" "$expected"], [0], [stdout])
+mv stdout expout
+AT_CHECK([ovs-dpctl normalize-actions "$flow" "$actual"], [0], [expout])
 
 # Check for the learning entry.
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  table=1, hard_timeout=60, tcp6,ipv6_src=fec0::1,ipv6_dst=2001:db8:85a3::8a2e:370:7334,tp_src=80,tp_dst=40000 actions=load:0x13198a2e03707348->NXM_NX_IPV6_DST[[0..63]],load:0x20010db885a308d3->NXM_NX_IPV6_DST[[64..127]]
  tcp6 actions=learn(table=1,hard_timeout=60,eth_type=0x86dd,nw_proto=6,NXM_NX_IPV6_SRC[[]]=NXM_NX_IPV6_DST[[]],ipv6_dst=2001:db8:85a3::8a2e:370:7334,NXM_OF_TCP_SRC[[]]=NXM_OF_TCP_DST[[]],NXM_OF_TCP_DST[[]]=NXM_OF_TCP_SRC[[]],load:0x20010db885a308d313198a2e03707348->NXM_NX_IPV6_DST[[]]),FLOOD
 NXST_FLOW reply:
@@ -161,10 +181,10 @@ AT_SETUP([learning action - fin_timeout feature])
 # This is a totally artificial use of the "learn" action.  The only purpose
 # is to check that specifying fin_idle_timeout or fin_hard_timeout causes
 # a corresponding fin_timeout action to end up in the learned flows.
-OVS_VSWITCHD_START
-AT_CHECK([[ovs-ofctl add-flow br0 'actions=learn(fin_hard_timeout=10, fin_idle_timeout=5, NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[], output:NXM_OF_IN_PORT[])']])
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(1),eth(src=50:54:00:00:00:05,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=192.168.0.1,tip=192.168.0.2,op=1,sha=50:54:00:00:00:05,tha=00:00:00:00:00:00)' -generate], [0], [ignore])
-AT_CHECK([ovs-ofctl dump-flows br0 table=1 | ofctl_strip], [0],
+OVS_VSWITCHD_START([add-port test-br0 p1 -- set Interface p1 type=dummy])
+AT_CHECK([[ovs-ofctl add-flow test-br0 'actions=learn(fin_hard_timeout=10, fin_idle_timeout=5, NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[], output:NXM_OF_IN_PORT[])']])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port(1),eth(src=50:54:00:00:00:05,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),arp(sip=192.168.0.1,tip=192.168.0.2,op=1,sha=50:54:00:00:00:05,tha=00:00:00:00:00:00)' -generate], [0], [ignore])
+AT_CHECK([ovs-ofctl dump-flows test-br0 table=1 | ofctl_strip], [0],
 [NXST_FLOW reply:
  table=1, dl_dst=50:54:00:00:00:05 actions=fin_timeout(idle_timeout=5,hard_timeout=10),output:1
 ])
diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
index 0691c16..b695e16 100644
--- a/tests/ofproto-dpif.at
+++ b/tests/ofproto-dpif.at
@@ -2,7 +2,7 @@ AT_BANNER([ofproto-dpif])
 
 AT_SETUP([ofproto-dpif - resubmit])
 OVS_VSWITCHD_START
-ADD_OF_PORTS([br0], [1], [10], [11], [12], [13], [14], [15],
+ADD_OF_PORTS([test-br0], [1], [10], [11], [12], [13], [14], [15],
                     [16], [17], [18], [19], [20], [21])
 AT_DATA([flows.txt], [dnl
 table=0 in_port=1 priority=1000 icmp actions=output(10),resubmit(2),output(19),resubmit(3),output(21)
@@ -12,8 +12,8 @@ table=1 in_port=1 priority=1000 icmp actions=output(12),resubmit(4,1),output(13)
 table=1 in_port=2 priority=1500 icmp actions=output(17),resubmit(,2)
 table=1 in_port=3 priority=1500 icmp actions=output(14),resubmit(,2)
 ])
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'], [0], [stdout])
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port=1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2,nw_proto=1,nw_tos=0,nw_ttl=128,icmp_type=8,icmp_code=0'], [0], [stdout])
 AT_CHECK([tail -1 stdout], [0],
   [Datapath actions: 10,11,12,13,14,15,16,17,18,19,20,21
 ])
@@ -22,7 +22,7 @@ AT_CLEANUP
 
 AT_SETUP([ofproto-dpif - registers])
 OVS_VSWITCHD_START
-ADD_OF_PORTS([br0], [20], [21], [22], [33], [90])
+ADD_OF_PORTS([test-br0], [20], [21], [22], [33], [90])
 AT_DATA([flows.txt], [dnl
 in_port=90                 actions=resubmit:2,resubmit:3,resubmit:4,resubmit:91
 in_port=91                 actions=resubmit:5,resubmit:6,resubmit:7,resubmit:92
@@ -46,8 +46,8 @@ in_port=13 actions=load:0x13->NXM_NX_REG3[[]],load:0x14->NXM_NX_REG4[[]],load:0x
 in_port=14 actions=load:0x16->NXM_NX_REG6[[]],load:0x17->NXM_NX_REG7[[]]
 in_port=15,reg0=0x10,reg1=0x11,reg2=0x12,reg3=0x13,reg4=0x14,reg5=0x15,reg6=0x16,reg7=0x17 actions=output:33
 ])
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
 AT_CHECK([tail -1 stdout], [0],
   [Datapath actions: 20,21,22,33
 ])
@@ -56,7 +56,7 @@ AT_CLEANUP
 
 AT_SETUP([ofproto-dpif - output])
 OVS_VSWITCHD_START
-ADD_OF_PORTS([br0], [1], [9], [10], [11], [55], [66], [77], [88])
+ADD_OF_PORTS([test-br0], [1], [9], [10], [11], [55], [66], [77], [88])
 AT_DATA([flows.txt], [dnl
 in_port=1 actions=resubmit:2,resubmit:3,resubmit:4,resubmit:5,resubmit:6,resubmit:7
 in_port=2 actions=output:9
@@ -66,8 +66,8 @@ in_port=5 actions=load:77->NXM_NX_REG0[[0..15]],load:88->NXM_NX_REG0[[16..31]]
 in_port=6 actions=output:NXM_NX_REG0[[0..15]],output:NXM_NX_REG0[[16..31]]
 in_port=7 actions=load:0x110000ff->NXM_NX_REG0[[]],output:NXM_NX_REG0[[]]
 ])
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
 AT_CHECK([tail -1 stdout], [0],
   [Datapath actions: 9,55,10,55,66,11,77,88
 ])
@@ -76,30 +76,30 @@ AT_CLEANUP
 
 AT_SETUP([ofproto-dpif - dec_ttl])
 OVS_VSWITCHD_START
-ADD_OF_PORTS([br0], [1], [2], [3], [4])
+ADD_OF_PORTS([test-br0], [1], [2], [3], [4])
 AT_DATA([flows.txt], [dnl
 table=0 in_port=1 action=dec_ttl,output:2,resubmit(1,1),output:4
 table=1 in_port=1 action=dec_ttl,output:3
 ])
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=2,frag=no)' -generate], [0], [stdout])
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=2,frag=no)' -generate], [0], [stdout])
 AT_CHECK([tail -3 stdout], [0],
   [Datapath actions: set(ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=1,frag=no)),2,4
 This flow is handled by the userspace slow path because it:
 	- Sends "packet-in" messages to the OpenFlow controller.
 ])
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=3,frag=no)'], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=3,frag=no)'], [0], [stdout])
 AT_CHECK([tail -1 stdout], [0],
   [Datapath actions: set(ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=2,frag=no)),2,set(ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=1,frag=no)),3,4
 ])
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x86dd),ipv6(src=::1,dst=::2,label=0,proto=10,tclass=0x70,hlimit=128,frag=no)'], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x86dd),ipv6(src=::1,dst=::2,label=0,proto=10,tclass=0x70,hlimit=128,frag=no)'], [0], [stdout])
 AT_CHECK([tail -1 stdout], [0],
   [Datapath actions: set(ipv6(src=::1,dst=::2,label=0,proto=10,tclass=0x70,hlimit=127,frag=no)),2,set(ipv6(src=::1,dst=::2,label=0,proto=10,tclass=0x70,hlimit=126,frag=no)),3,4
 ])
 
 AT_CAPTURE_FILE([ofctl_monitor.log])
-AT_CHECK([ovs-ofctl monitor br0 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log])
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=2,frag=no)' -generate], [0], [stdout])
+AT_CHECK([ovs-ofctl monitor test-br0 65534 invalid_ttl --detach --no-chdir --pidfile 2> ofctl_monitor.log])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=2,frag=no)' -generate], [0], [stdout])
 OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit])
 AT_CHECK([cat ofctl_monitor.log], [0], [dnl
 NXT_PACKET_IN (xid=0x0): table_id=1 total_len=42 in_port=1 (via invalid_ttl) data_len=42 (unbuffered)
@@ -110,18 +110,17 @@ AT_CLEANUP
 
 
 AT_SETUP([ofproto-dpif - output, OFPP_NONE ingress port])
-OVS_VSWITCHD_START(
-       [add-port br0 p1 -- set Interface p1 type=dummy --\
-        add-port br0 p2 -- set Interface p2 type=dummy])
+OVS_VSWITCHD_START
+ADD_OF_PORTS([test-br0], [1], [2])
 
-AT_CHECK([ovs-ofctl add-flow br0 action=normal])
+AT_CHECK([ovs-ofctl add-flow test-br0 action=normal])
 
 # "in_port" defaults to OFPP_NONE if it's not specified.
 flow="eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
-AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow"], [0], [stdout])
 actual=`tail -1 stdout | sed 's/Datapath actions: //'`
 
-expected="0,1,2"
+expected="1,2,100"
 AT_CHECK([ovs-dpctl normalize-actions "$flow" "$expected"], [0], [stdout])
 mv stdout expout
 AT_CHECK([ovs-dpctl normalize-actions "$flow" "$actual"], [0], [expout])
@@ -130,34 +129,34 @@ OVS_VSWITCHD_STOP
 AT_CLEANUP
 
 AT_SETUP([ofproto-dpif - DSCP])
-OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=dummy])
+OVS_VSWITCHD_START([add-port test-br0 p1 -- set Interface p1 type=dummy])
 AT_DATA([flows.txt], [dnl
 actions=output:65534,enqueue:1:1,enqueue:1:2,enqueue:1:2,enqueue:1:1,output:1,mod_nw_tos:0,output:1,output:65534
 ])
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
 AT_CHECK([ovs-vsctl -- \
         set Port p1 qos=@newqos --\
         --id=@newqos create QoS type=linux-htb queues=1=@q1,2=@q2 --\
         --id=@q1 create Queue dscp=1 --\
         --id=@q2 create Queue dscp=2], [0], [ignore])
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(9),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=1.1.1.1,dst=2.2.2.2,proto=1,tos=0xff,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port(9),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=1.1.1.1,dst=2.2.2.2,proto=1,tos=0xff,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
 AT_CHECK([tail -1 stdout], [0],
   [Datapath actions: dnl
-0,dnl
+100,dnl
 set(ipv4(src=1.1.1.1,dst=2.2.2.2,proto=1,tos=0x7,ttl=128,frag=no)),set(priority(1)),1,dnl
 set(ipv4(src=1.1.1.1,dst=2.2.2.2,proto=1,tos=0xb,ttl=128,frag=no)),set(priority(2)),1,dnl
 1,dnl
 set(ipv4(src=1.1.1.1,dst=2.2.2.2,proto=1,tos=0x7,ttl=128,frag=no)),set(priority(1)),1,dnl
 set(ipv4(src=1.1.1.1,dst=2.2.2.2,proto=1,tos=0xff,ttl=128,frag=no)),set(priority(0)),1,dnl
 set(ipv4(src=1.1.1.1,dst=2.2.2.2,proto=1,tos=0x3,ttl=128,frag=no)),1,dnl
-0
+100
 ])
 OVS_VSWITCHD_STOP
 AT_CLEANUP
 
 AT_SETUP([ofproto-dpif - output/flood flags])
 OVS_VSWITCHD_START
-ADD_OF_PORTS([br0], [1], [2], [3], [4], [5], [6], [7])
+ADD_OF_PORTS([test-br0], [1], [2], [3], [4], [5], [6], [7])
 
 AT_DATA([flows.txt], [dnl
 in_port=local actions=local,flood
@@ -166,11 +165,11 @@ in_port=2 actions=all
 in_port=3 actions=output:65534,output:1,output:2,output:3,output:4,output:5,output:6,output:7
 in_port=4 actions=enqueue:65534:1,enqueue:1:1,enqueue:2:1,enqueue:3:2,enqueue:4:1,enqueue:5:1,enqueue:6:1,enqueue:7:1
 ])
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-AT_CHECK([ovs-ofctl mod-port br0 5 noforward])
-AT_CHECK([ovs-ofctl mod-port br0 6 noflood])
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
+AT_CHECK([ovs-ofctl mod-port test-br0 5 noforward])
+AT_CHECK([ovs-ofctl mod-port test-br0 6 noflood])
 
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(0),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port(100),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'], [0], [stdout])
 AT_CHECK([tail -1 stdout \
 | sed -e 's/Datapath actions: //' | tr ',' '\n' | sort], [0], [dnl
 1
@@ -180,42 +179,42 @@ AT_CHECK([tail -1 stdout \
 7
 ])
 
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(1),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port(1),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'], [0], [stdout])
 AT_CHECK([tail -1 stdout \
 | sed -e 's/Datapath actions: //' | tr ',' '\n' | sort], [0], [dnl
-0
+100
 2
 3
 4
 7
 ])
 
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(2),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port(2),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'], [0], [stdout])
 AT_CHECK([tail -1 stdout \
 | sed -e 's/Datapath actions: //' | tr ',' '\n' | sort], [0], [dnl
-0
 1
+100
 3
 4
 6
 7
 ])
 
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(3),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port(3),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'], [0], [stdout])
 AT_CHECK([tail -1 stdout], [0],
-  [Datapath actions: 0,1,2,4,6,7
+  [Datapath actions: 100,1,2,4,6,7
 ])
 
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(4),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port(4),eth(src=00:00:00:00:00:01,dst=00:00:00:00:00:02),eth_type(0x0900)'], [0], [stdout])
 AT_CHECK([tail -1 stdout], [0],
-  [Datapath actions: set(priority(1)),0,1,2,set(priority(2)),3,set(priority(1)),6,7
+  [Datapath actions: set(priority(1)),100,1,2,set(priority(2)),3,set(priority(1)),6,7
 ])
 OVS_VSWITCHD_STOP
 AT_CLEANUP
 
 AT_SETUP([ofproto-dpif - set_tunnel])
 OVS_VSWITCHD_START
-ADD_OF_PORTS([br0], [1], [2], [3], [4], [5], [90])
+ADD_OF_PORTS([test-br0], [1], [2], [3], [4], [5], [90])
 AT_DATA([flows.txt], [dnl
 in_port=90 actions=resubmit:1,resubmit:2,resubmit:3,resubmit:4,resubmit:5
 in_port=1 actions=set_tunnel:1,output:1
@@ -224,8 +223,8 @@ in_port=3 actions=set_tunnel:2,set_tunnel:3,output:3
 in_port=4 actions=set_tunnel:4,set_tunnel:3,output:4
 in_port=5 actions=set_tunnel:5
 ])
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-AT_CHECK([ovs-appctl ofproto/trace br0 'tun_id(0x1),in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'tun_id(0x1),in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
 AT_CHECK([tail -1 stdout], [0],
   [Datapath actions: set(tun_id(0x1)),1,2,set(tun_id(0x3)),3,4
 ])
@@ -234,7 +233,7 @@ AT_CLEANUP
 
 AT_SETUP([ofproto-dpif - controller])
 OVS_VSWITCHD_START([dnl
-   add-port br0 p1 -- set Interface p1 type=dummy
+   add-port test-br0 p1 -- set Interface p1 type=dummy
 ])
 
 AT_CAPTURE_FILE([ofctl_monitor.log])
@@ -251,10 +250,10 @@ cookie=0x7 table=5 in_port=84 actions=load:5->NXM_NX_REG4[[]],load:6->NXM_NX_TUN
 cookie=0x8 table=6 in_port=85 actions=mod_tp_src:85,controller,resubmit(86,7)
 cookie=0x9 table=7 in_port=86 actions=mod_tp_dst:86,controller,controller
 ])
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
 
 dnl Flow miss.
-AT_CHECK([ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log])
+AT_CHECK([ovs-ofctl monitor -P openflow10 test-br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log])
 
 for i in 1 2 3 ; do
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
@@ -273,7 +272,7 @@ priority:0,metadata:0,in_port:0000,tci(0) mac(50:54:00:00:00:05->50:54:00:00:00:
 ])
 
 dnl Singleton controller action.
-AT_CHECK([ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log])
+AT_CHECK([ovs-ofctl monitor -P openflow10 test-br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log])
 
 for i in 1 2 3 ; do
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=10:11:11:11:11:11,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=10)'
@@ -292,7 +291,7 @@ priority:0,metadata:0,in_port:0000,tci(0) mac(10:11:11:11:11:11->50:54:00:00:00:
 ])
 
 dnl Modified controller action.
-AT_CHECK([ovs-ofctl monitor -P openflow10 br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log])
+AT_CHECK([ovs-ofctl monitor -P openflow10 test-br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log])
 
 for i in 1 2 3 ; do
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=30:33:33:33:33:33,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=10)'
@@ -311,7 +310,7 @@ priority:0,metadata:0,in_port:0000,tci(vlan:15,pcp:0) mac(30:33:33:33:33:33->50:
 ])
 
 dnl Checksum TCP.
-AT_CHECK([ovs-ofctl monitor br0 65534 -P nxm --detach --no-chdir --pidfile 2> ofctl_monitor.log])
+AT_CHECK([ovs-ofctl monitor test-br0 65534 -P nxm --detach --no-chdir --pidfile 2> ofctl_monitor.log])
 
 for i in 1 ; do
     ovs-appctl netdev-dummy/receive p1 'in_port(1),eth(src=20:22:22:22:22:22,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=11)'
@@ -348,7 +347,7 @@ priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0) mac(80:81:81:81:81:81->82:
 ])
 
 dnl Checksum UDP.
-AT_CHECK([ovs-ofctl monitor br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log])
+AT_CHECK([ovs-ofctl monitor test-br0 65534 --detach --no-chdir --pidfile 2> ofctl_monitor.log])
 
 for i in 1 ; do
     ovs-appctl netdev-dummy/receive p1 '50 54 00 00 00 07 20 22 22 22 22 22 08 00 45 00 00 1C 00 00 00 00 00 11 00 00 C0 A8 00 01 C0 A8 00 02 00 08 00 0B 00 00 12 34 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -384,7 +383,7 @@ NXT_PACKET_IN (xid=0x0): table_id=7 cookie=0x9 total_len=64 in_port=1 tun_id=0x6
 priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0) mac(80:81:81:81:81:81->82:82:82:82:82:82) type:0800 proto:17 tos:0 ttl:0 ip(83.83.83.83->84.84.84.84) port(85->86) udp_csum:43a1
 ])
 
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x1, n_packets=2, n_bytes=120, dl_src=20:22:22:22:22:22 actions=CONTROLLER:65535,resubmit(80,1)
  cookie=0x2, n_packets=3, n_bytes=180, dl_src=30:33:33:33:33:33 actions=mod_vlan_vid:15,CONTROLLER:65535
  cookie=0x3, table=1, n_packets=2, n_bytes=120, in_port=80 actions=load:0x1->NXM_NX_REG0[[]],mod_vlan_vid:80,CONTROLLER:65535,resubmit(81,2)
@@ -403,16 +402,16 @@ AT_CLEANUP
 
 AT_SETUP([ofproto-dpif - VLAN handling])
 OVS_VSWITCHD_START(
-  [set Bridge br0 fail-mode=standalone -- \
-   add-port br0 p1                                  trunks=10,12 -- \
-   add-port br0 p2                           tag=10              -- \
-   add-port br0 p3                           tag=12              \
+  [set Bridge test-br0 fail-mode=standalone -- \
+   add-port test-br0 p1                                  trunks=10,12 -- \
+   add-port test-br0 p2                           tag=10              -- \
+   add-port test-br0 p3                           tag=12              \
                    other-config:priority-tags=true               -- \
-   add-port br0 p4                           tag=12              -- \
-   add-port br0 p5 vlan_mode=native-tagged   tag=10              -- \
-   add-port br0 p6 vlan_mode=native-tagged   tag=10 trunks=10,12 -- \
-   add-port br0 p7 vlan_mode=native-untagged tag=12              -- \
-   add-port br0 p8 vlan_mode=native-untagged tag=12 trunks=10,12 \
+   add-port test-br0 p4                           tag=12              -- \
+   add-port test-br0 p5 vlan_mode=native-tagged   tag=10              -- \
+   add-port test-br0 p6 vlan_mode=native-tagged   tag=10 trunks=10,12 -- \
+   add-port test-br0 p7 vlan_mode=native-untagged tag=12              -- \
+   add-port test-br0 p8 vlan_mode=native-untagged tag=12 trunks=10,12 \
                    other-config:priority-tags=true               -- \
    set Interface p1 type=dummy -- \
    set Interface p2 type=dummy -- \
@@ -427,87 +426,87 @@ dnl Each of these specifies an in_port by number, a VLAN VID (or "none"),
 dnl a VLAN PCP (used if the VID isn't "none") and the expected set of datapath
 dnl actions.
 for tuple in \
-        "0 none 0 drop" \
-        "0 0    0 drop" \
-        "0 0    1 drop" \
-        "0 10   0 1,5,6,7,8,pop_vlan,2" \
-        "0 10   1 1,5,6,7,8,pop_vlan,2" \
-        "0 11   0 5,7" \
-        "0 11   1 5,7" \
-        "0 12   0 1,5,6,pop_vlan,3,4,7,8" \
-        "0 12   1 1,5,6,pop_vlan,4,7,push_vlan(vid=0,pcp=1),3,8" \
+        "100 none 0 drop" \
+        "100 0    0 drop" \
+        "100 0    1 drop" \
+        "100 10   0 1,5,6,7,8,pop_vlan,2" \
+        "100 10   1 1,5,6,7,8,pop_vlan,2" \
+        "100 11   0 5,7" \
+        "100 11   1 5,7" \
+        "100 12   0 1,5,6,pop_vlan,3,4,7,8" \
+        "100 12   1 1,5,6,pop_vlan,4,7,push_vlan(vid=0,pcp=1),3,8" \
         "1  none 0 drop" \
         "1  0    0 drop" \
         "1  0    1 drop" \
-        "1  10   0 0,5,6,7,8,pop_vlan,2" \
-        "1  10   1 0,5,6,7,8,pop_vlan,2" \
+        "1  10   0 5,6,7,8,100,pop_vlan,2" \
+        "1  10   1 5,6,7,8,100,pop_vlan,2" \
         "1  11   0 drop" \
         "1  11   1 drop" \
-        "1  12   0 0,5,6,pop_vlan,3,4,7,8" \
-        "1  12   1 0,5,6,pop_vlan,4,7,push_vlan(vid=0,pcp=1),3,8" \
-        "2  none 0 push_vlan(vid=10,pcp=0),0,1,5,6,7,8" \
-        "2  0    0 pop_vlan,push_vlan(vid=10,pcp=0),0,1,5,6,7,8" \
-        "2  0    1 pop_vlan,push_vlan(vid=10,pcp=1),0,1,5,6,7,8" \
+        "1  12   0 5,6,100,pop_vlan,3,4,7,8" \
+        "1  12   1 5,6,100,pop_vlan,4,7,push_vlan(vid=0,pcp=1),3,8" \
+        "2  none 0 push_vlan(vid=10,pcp=0),1,5,6,7,8,100" \
+        "2  0    0 pop_vlan,push_vlan(vid=10,pcp=0),1,5,6,7,8,100" \
+        "2  0    1 pop_vlan,push_vlan(vid=10,pcp=1),1,5,6,7,8,100" \
         "2  10   0 drop" \
         "2  10   1 drop" \
         "2  11   0 drop" \
         "2  11   1 drop" \
         "2  12   0 drop" \
         "2  12   1 drop" \
-        "3  none 0 4,7,8,push_vlan(vid=12,pcp=0),0,1,5,6" \
-        "3  0    0 pop_vlan,4,7,8,push_vlan(vid=12,pcp=0),0,1,5,6" \
-        "3  0    1 8,pop_vlan,4,7,push_vlan(vid=12,pcp=1),0,1,5,6" \
+        "3  none 0 4,7,8,push_vlan(vid=12,pcp=0),1,5,6,100" \
+        "3  0    0 pop_vlan,4,7,8,push_vlan(vid=12,pcp=0),1,5,6,100" \
+        "3  0    1 8,pop_vlan,4,7,push_vlan(vid=12,pcp=1),1,5,6,100" \
         "3  10   0 drop" \
         "3  10   1 drop" \
         "3  11   0 drop" \
         "3  11   1 drop" \
         "3  12   0 drop" \
         "3  12   1 drop" \
-        "4  none 0 3,7,8,push_vlan(vid=12,pcp=0),0,1,5,6" \
-        "4  0    0 pop_vlan,3,7,8,push_vlan(vid=12,pcp=0),0,1,5,6" \
-        "4  0    1 3,8,pop_vlan,7,push_vlan(vid=12,pcp=1),0,1,5,6" \
+        "4  none 0 3,7,8,push_vlan(vid=12,pcp=0),1,5,6,100" \
+        "4  0    0 pop_vlan,3,7,8,push_vlan(vid=12,pcp=0),1,5,6,100" \
+        "4  0    1 3,8,pop_vlan,7,push_vlan(vid=12,pcp=1),1,5,6,100" \
         "4  10   0 drop" \
         "4  10   1 drop" \
         "4  11   0 drop" \
         "4  11   1 drop" \
         "4  12   0 drop" \
         "4  12   1 drop" \
-        "5  none 0 2,push_vlan(vid=10,pcp=0),0,1,6,7,8" \
-        "5  0    0 pop_vlan,2,push_vlan(vid=10,pcp=0),0,1,6,7,8" \
-        "5  0    1 pop_vlan,2,push_vlan(vid=10,pcp=1),0,1,6,7,8" \
-        "5  10   0 0,1,6,7,8,pop_vlan,2" \
-        "5  10   1 0,1,6,7,8,pop_vlan,2" \
-        "5  11   0 0,7" \
-        "5  11   1 0,7" \
-        "5  12   0 0,1,6,pop_vlan,3,4,7,8" \
-        "5  12   1 0,1,6,pop_vlan,4,7,push_vlan(vid=0,pcp=1),3,8" \
-        "6  none 0 2,push_vlan(vid=10,pcp=0),0,1,5,7,8" \
-        "6  0    0 pop_vlan,2,push_vlan(vid=10,pcp=0),0,1,5,7,8" \
-        "6  0    1 pop_vlan,2,push_vlan(vid=10,pcp=1),0,1,5,7,8" \
-        "6  10   0 0,1,5,7,8,pop_vlan,2" \
-        "6  10   1 0,1,5,7,8,pop_vlan,2" \
+        "5  none 0 2,push_vlan(vid=10,pcp=0),1,6,7,8,100" \
+        "5  0    0 pop_vlan,2,push_vlan(vid=10,pcp=0),1,6,7,8,100" \
+        "5  0    1 pop_vlan,2,push_vlan(vid=10,pcp=1),1,6,7,8,100" \
+        "5  10   0 1,6,7,8,100,pop_vlan,2" \
+        "5  10   1 1,6,7,8,100,pop_vlan,2" \
+        "5  11   0 7,100" \
+        "5  11   1 7,100" \
+        "5  12   0 1,6,100,pop_vlan,3,4,7,8" \
+        "5  12   1 1,6,100,pop_vlan,4,7,push_vlan(vid=0,pcp=1),3,8" \
+        "6  none 0 2,push_vlan(vid=10,pcp=0),1,5,7,8,100" \
+        "6  0    0 pop_vlan,2,push_vlan(vid=10,pcp=0),1,5,7,8,100" \
+        "6  0    1 pop_vlan,2,push_vlan(vid=10,pcp=1),1,5,7,8,100" \
+        "6  10   0 1,5,7,8,100,pop_vlan,2" \
+        "6  10   1 1,5,7,8,100,pop_vlan,2" \
         "6  11   0 drop" \
         "6  11   1 drop" \
-        "6  12   0 0,1,5,pop_vlan,3,4,7,8" \
-        "6  12   1 0,1,5,pop_vlan,4,7,push_vlan(vid=0,pcp=1),3,8" \
-        "7  none 0 3,4,8,push_vlan(vid=12,pcp=0),0,1,5,6" \
-        "7  0    0 pop_vlan,3,4,8,push_vlan(vid=12,pcp=0),0,1,5,6" \
-        "7  0    1 3,8,pop_vlan,4,push_vlan(vid=12,pcp=1),0,1,5,6" \
-        "7  10   0 0,1,5,6,8,pop_vlan,2" \
-        "7  10   1 0,1,5,6,8,pop_vlan,2" \
-        "7  11   0 0,5" \
-        "7  11   1 0,5" \
-        "7  12   0 0,1,5,6,pop_vlan,3,4,8" \
-        "7  12   1 0,1,5,6,pop_vlan,4,push_vlan(vid=0,pcp=1),3,8" \
-        "8  none 0 3,4,7,push_vlan(vid=12,pcp=0),0,1,5,6" \
-        "8  0    0 pop_vlan,3,4,7,push_vlan(vid=12,pcp=0),0,1,5,6" \
-        "8  0    1 3,pop_vlan,4,7,push_vlan(vid=12,pcp=1),0,1,5,6" \
-        "8  10   0 0,1,5,6,7,pop_vlan,2" \
-        "8  10   1 0,1,5,6,7,pop_vlan,2" \
+        "6  12   0 1,5,100,pop_vlan,3,4,7,8" \
+        "6  12   1 1,5,100,pop_vlan,4,7,push_vlan(vid=0,pcp=1),3,8" \
+        "7  none 0 3,4,8,push_vlan(vid=12,pcp=0),1,5,6,100" \
+        "7  0    0 pop_vlan,3,4,8,push_vlan(vid=12,pcp=0),1,5,6,100" \
+        "7  0    1 3,8,pop_vlan,4,push_vlan(vid=12,pcp=1),1,5,6,100" \
+        "7  10   0 1,5,6,8,100,pop_vlan,2" \
+        "7  10   1 1,5,6,8,100,pop_vlan,2" \
+        "7  11   0 5,100" \
+        "7  11   1 5,100" \
+        "7  12   0 1,5,6,100,pop_vlan,3,4,8" \
+        "7  12   1 1,5,6,100,pop_vlan,4,push_vlan(vid=0,pcp=1),3,8" \
+        "8  none 0 3,4,7,push_vlan(vid=12,pcp=0),1,5,6,100" \
+        "8  0    0 pop_vlan,3,4,7,push_vlan(vid=12,pcp=0),1,5,6,100" \
+        "8  0    1 3,pop_vlan,4,7,push_vlan(vid=12,pcp=1),1,5,6,100" \
+        "8  10   0 1,5,6,7,100,pop_vlan,2" \
+        "8  10   1 1,5,6,7,100,pop_vlan,2" \
         "8  11   0 drop" \
         "8  11   1 drop" \
-        "8  12   0 0,1,5,6,pop_vlan,3,4,7" \
-        "8  12   1 0,1,5,6,pop_vlan,4,7,push_vlan(vid=0,pcp=1),3"
+        "8  12   0 1,5,6,100,pop_vlan,3,4,7" \
+        "8  12   1 1,5,6,100,pop_vlan,4,7,push_vlan(vid=0,pcp=1),3"
 do
   set $tuple
   in_port=$1
@@ -524,7 +523,7 @@ do
   echo "----------------------------------------------------------------------"
   echo "in_port=$in_port vlan=$vlan pcp=$pcp"
 
-  AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout])
+  AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow"], [0], [stdout])
   actual=`tail -1 stdout | sed 's/Datapath actions: //'`
 
   AT_CHECK([ovs-dpctl normalize-actions "$flow" "$expected"], [0], [stdout])
@@ -537,7 +536,7 @@ AT_CLEANUP
 
 AT_SETUP([ofproto-dpif - fragment handling])
 OVS_VSWITCHD_START
-ADD_OF_PORTS([br0], [1], [2], [3], [4], [5], [6])
+ADD_OF_PORTS([test-br0], [1], [2], [3], [4], [5], [6])
 AT_DATA([flows.txt], [dnl
 priority=75 tcp ip_frag=no    tp_dst=80 actions=output:1
 priority=75 tcp ip_frag=first tp_dst=80 actions=output:2
@@ -546,7 +545,7 @@ priority=50 tcp ip_frag=no              actions=output:4
 priority=50 tcp ip_frag=first           actions=output:5
 priority=50 tcp ip_frag=later           actions=output:6
 ])
-AT_CHECK([ovs-ofctl replace-flows br0 flows.txt])
+AT_CHECK([ovs-ofctl replace-flows test-br0 flows.txt])
 
 base_flow="in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=128"
 no_flow="$base_flow,frag=no),tcp(src=12345,dst=80)"
@@ -565,10 +564,10 @@ do
   first=$3
   later=$4
 
-  AT_CHECK([ovs-ofctl set-frags br0 $mode])
+  AT_CHECK([ovs-ofctl set-frags test-br0 $mode])
   for type in no first later; do
     eval flow=\$${type}_flow exp_output=\$$type
-    AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout])
+    AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow"], [0], [stdout])
     AT_CHECK_UNQUOTED([tail -1 stdout], [0], [Datapath actions: $exp_output
 ])
   done
@@ -578,22 +577,22 @@ AT_CLEANUP
 
 AT_SETUP([ofproto-dpif - exit])
 OVS_VSWITCHD_START
-ADD_OF_PORTS([br0], [1], [2], [3], [10], [11], [12], [13], [14])
+ADD_OF_PORTS([test-br0], [1], [2], [3], [10], [11], [12], [13], [14])
 AT_DATA([flows.txt], [dnl
 in_port=1 actions=output:10,exit,output:11
 in_port=2 actions=output:12,resubmit:1,output:12
 in_port=3 actions=output:13,resubmit:2,output:14
 ])
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
 AT_CHECK([tail -1 stdout], [0],
   [Datapath actions: 10
 ])
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
 AT_CHECK([tail -1 stdout], [0],
   [Datapath actions: 12,10
 ])
-AT_CHECK([ovs-appctl ofproto/trace br0 'in_port(3),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 'in_port(3),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'], [0], [stdout])
 AT_CHECK([tail -1 stdout], [0],
   [Datapath actions: 13,12,10
 ])
@@ -603,10 +602,10 @@ AT_CLEANUP
 
 AT_SETUP([ofproto-dpif - mirroring, select_all])
 OVS_VSWITCHD_START(
-       [add-port br0 p1 -- set Interface p1 type=dummy --\
-        add-port br0 p2 -- set Interface p2 type=dummy --\
-        add-port br0 p3 -- set Interface p3 type=dummy --\
-        set Bridge br0 mirrors=@m --\
+       [add-port test-br0 p1 -- set Interface p1 type=dummy --\
+        add-port test-br0 p2 -- set Interface p2 type=dummy --\
+        add-port test-br0 p3 -- set Interface p3 type=dummy --\
+        set Bridge test-br0 mirrors=@m --\
         --id=@p3 get Port p3 --\
         --id=@m create Mirror name=mymirror \
         select_all=true output_port=@p3], [<0>
@@ -616,16 +615,16 @@ AT_DATA([flows.txt], [dnl
 in_port=1 actions=output:2
 in_port=2 actions=output:1
 ])
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
 
 flow="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
-AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow"], [0], [stdout])
 AT_CHECK_UNQUOTED([tail -1 stdout], [0],
   [Datapath actions: 2,3
 ])
 
 flow="in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
-AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow"], [0], [stdout])
 AT_CHECK_UNQUOTED([tail -1 stdout], [0],
   [Datapath actions: 1,3
 ])
@@ -636,10 +635,10 @@ AT_CLEANUP
 
 AT_SETUP([ofproto-dpif - mirroring, select_src])
 OVS_VSWITCHD_START(
-       [add-port br0 p1 -- set Interface p1 type=dummy --\
-        add-port br0 p2 -- set Interface p2 type=dummy --\
-        add-port br0 p3 -- set Interface p3 type=dummy --\
-        set Bridge br0 mirrors=@m --\
+       [add-port test-br0 p1 -- set Interface p1 type=dummy --\
+        add-port test-br0 p2 -- set Interface p2 type=dummy --\
+        add-port test-br0 p3 -- set Interface p3 type=dummy --\
+        set Bridge test-br0 mirrors=@m --\
         --id=@p1 get Port p1 -- --id=@p3 get Port p3 --\
         --id=@m create Mirror name=mymirror \
         select_src_port=@p1 output_port=@p3], [<0>
@@ -649,16 +648,16 @@ AT_DATA([flows.txt], [dnl
 in_port=1 actions=output:2
 in_port=2 actions=output:1
 ])
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
 
 flow="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
-AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow"], [0], [stdout])
 AT_CHECK_UNQUOTED([tail -1 stdout], [0],
   [Datapath actions: 2,3
 ])
 
 flow="in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
-AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow"], [0], [stdout])
 AT_CHECK_UNQUOTED([tail -1 stdout], [0],
   [Datapath actions: 1
 ])
@@ -667,19 +666,19 @@ AT_CLEANUP
 
 AT_SETUP([ofproto-dpif - mirroring, OFPP_NONE ingress port])
 OVS_VSWITCHD_START(
-       [add-port br0 p1 -- set Interface p1 type=dummy --\
-        add-port br0 p2 -- set Interface p2 type=dummy --\
-        set Bridge br0 mirrors=@m --\
+       [add-port test-br0 p1 -- set Interface p1 type=dummy --\
+        add-port test-br0 p2 -- set Interface p2 type=dummy --\
+        set Bridge test-br0 mirrors=@m --\
         --id=@p2 get Port p2 --\
         --id=@m create Mirror name=mymirror \
         select_all=true output_port=@p2], [<0>
 ])
 
-AT_CHECK([ovs-ofctl add-flow br0 action=output:1])
+AT_CHECK([ovs-ofctl add-flow test-br0 action=output:1])
 
 # "in_port" defaults to OFPP_NONE if it's not specified.
 flow="eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
-AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow"], [0], [stdout])
 AT_CHECK_UNQUOTED([tail -1 stdout], [0],
   [Datapath actions: 1,2
 ])
@@ -690,10 +689,10 @@ AT_CLEANUP
 
 AT_SETUP([ofproto-dpif - mirroring, select_dst])
 OVS_VSWITCHD_START(
-       [add-port br0 p1 -- set Interface p1 type=dummy --\
-        add-port br0 p2 -- set Interface p2 type=dummy --\
-        add-port br0 p3 -- set Interface p3 type=dummy --\
-        set Bridge br0 mirrors=@m --\
+       [add-port test-br0 p1 -- set Interface p1 type=dummy ofport_request=1 --\
+        add-port test-br0 p2 -- set Interface p2 type=dummy ofport_request=2 --\
+        add-port test-br0 p3 -- set Interface p3 type=dummy ofport_request=3 --\
+        set Bridge test-br0 mirrors=@m --\
         --id=@p2 get Port p2 -- --id=@p3 get Port p3 --\
         --id=@m create Mirror name=mymirror \
         select_dst_port=@p2 output_port=@p3], [<0>
@@ -703,16 +702,16 @@ AT_DATA([flows.txt], [dnl
 in_port=1 actions=output:2
 in_port=2 actions=output:1
 ])
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
 
 flow="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
-AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow"], [0], [stdout])
 AT_CHECK_UNQUOTED([tail -1 stdout], [0],
   [Datapath actions: 2,3
 ])
 
 flow="in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
-AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow"], [0], [stdout])
 AT_CHECK_UNQUOTED([tail -1 stdout], [0],
   [Datapath actions: 1
 ])
@@ -723,10 +722,10 @@ AT_CLEANUP
 
 AT_SETUP([ofproto-dpif - mirroring, select_vlan])
 OVS_VSWITCHD_START(
-       [add-port br0 p1 -- set Interface p1 type=dummy --\
-        add-port br0 p2 -- set Interface p2 type=dummy --\
-        add-port br0 p3 -- set Interface p3 type=dummy --\
-        set Bridge br0 mirrors=@m --\
+       [add-port test-br0 p1 -- set Interface p1 type=dummy --\
+        add-port test-br0 p2 -- set Interface p2 type=dummy --\
+        add-port test-br0 p3 -- set Interface p3 type=dummy --\
+        set Bridge test-br0 mirrors=@m --\
         --id=@p2 get Port p2 -- --id=@p3 get Port p3 --\
         --id=@m create Mirror name=mymirror \
         select_all=true select_vlan=11 output_port=@p3], [<0>
@@ -735,22 +734,22 @@ OVS_VSWITCHD_START(
 AT_DATA([flows.txt], [dnl
 in_port=1, actions=output:2
 ])
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
 
 flow="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
-AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow"], [0], [stdout])
 AT_CHECK_UNQUOTED([tail -1 stdout], [0],
   [Datapath actions: 2
 ])
 
 flow="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x8100),vlan(vid=10,pcp=0),encap(eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0))"
-AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow"], [0], [stdout])
 AT_CHECK_UNQUOTED([tail -1 stdout], [0],
   [Datapath actions: 2
 ])
 
 flow="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x8100),vlan(vid=11,pcp=0),encap(eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0))"
-AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow"], [0], [stdout])
 AT_CHECK_UNQUOTED([tail -1 stdout], [0],
   [Datapath actions: 2,3
 ])
@@ -761,10 +760,10 @@ AT_CLEANUP
 
 AT_SETUP([ofproto-dpif - mirroring, output_port])
 OVS_VSWITCHD_START(
-       [add-port br0 p1 -- set Interface p1 type=dummy --\
-        add-port br0 p2 -- set Interface p2 type=dummy --\
-        add-port br0 p3 -- set Interface p3 type=dummy --\
-        set Bridge br0 mirrors=@m --\
+       [add-port test-br0 p1 -- set Interface p1 type=dummy --\
+        add-port test-br0 p2 -- set Interface p2 type=dummy --\
+        add-port test-br0 p3 -- set Interface p3 type=dummy --\
+        set Bridge test-br0 mirrors=@m --\
         --id=@p3 get Port p3 --\
         --id=@m create Mirror name=mymirror \
         select_all=true output_port=@p3], [<0>
@@ -774,16 +773,16 @@ AT_DATA([flows.txt], [dnl
 in_port=1 actions=mod_vlan_vid:17,output:2
 in_port=2 actions=output:1
 ])
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
 
 flow="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
-AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow"], [0], [stdout])
 AT_CHECK_UNQUOTED([tail -1 stdout], [0],
   [Datapath actions: push_vlan(vid=17,pcp=0),2,pop_vlan,3
 ])
 
 flow="in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
-AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow"], [0], [stdout])
 AT_CHECK_UNQUOTED([tail -1 stdout], [0],
   [Datapath actions: 1,3
 ])
@@ -793,9 +792,9 @@ AT_CLEANUP
 
 AT_SETUP([ofproto-dpif - mirroring, output_vlan])
 OVS_VSWITCHD_START(
-       [add-port br0 p1 -- set Interface p1 type=dummy --\
-        add-port br0 p2 -- set Interface p2 type=dummy --\
-        set Bridge br0 mirrors=@m --\
+       [add-port test-br0 p1 -- set Interface p1 type=dummy --\
+        add-port test-br0 p2 -- set Interface p2 type=dummy --\
+        set Bridge test-br0 mirrors=@m --\
         --id=@m create Mirror name=mymirror \
         select_all=true output_vlan=12], [<0>
 ])
@@ -804,22 +803,22 @@ AT_DATA([flows.txt], [dnl
 in_port=1 actions=output:2
 in_port=2 actions=mod_vlan_vid:17,output:1
 ])
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
 
 flow="in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
-AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow"], [0], [stdout])
 actual=`tail -1 stdout | sed 's/Datapath actions: //'`
 
-expected="2,push_vlan(vid=12,pcp=0),0,1,2"
+expected="2,push_vlan(vid=12,pcp=0),1,2,100"
 AT_CHECK([ovs-dpctl normalize-actions "$flow" "$expected"], [0], [stdout])
 mv stdout expout
 AT_CHECK([ovs-dpctl normalize-actions "$flow" "$actual"], [0], [expout])
 
 flow="in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)"
-AT_CHECK([ovs-appctl ofproto/trace br0 "$flow"], [0], [stdout])
+AT_CHECK([ovs-appctl ofproto/trace test-br0 "$flow"], [0], [stdout])
 actual=`tail -1 stdout | sed 's/Datapath actions: //'`
 
-expected="push_vlan(vid=17,pcp=0),1,pop_vlan,push_vlan(vid=12,pcp=0),0,1,2"
+expected="push_vlan(vid=17,pcp=0),1,pop_vlan,push_vlan(vid=12,pcp=0),1,2,100"
 AT_CHECK([ovs-dpctl normalize-actions "$flow" "$expected"], [0], [stdout])
 mv stdout expout
 AT_CHECK([ovs-dpctl normalize-actions "$flow" "$actual"], [0], [expout])
@@ -840,22 +839,22 @@ m4_define([OFPROTO_TRACE],
 
 AT_SETUP([ofproto-dpif - MAC learning])
 OVS_VSWITCHD_START(
-  [set bridge br0 fail-mode=standalone -- \
-   add-port br0 p1 -- set Interface p1 type=dummy -- \
-   add-port br0 p2 -- set Interface p2 type=dummy -- \
-   add-port br0 p3 -- set Interface p3 type=dummy])
+  [set bridge test-br0 fail-mode=standalone -- \
+   add-port test-br0 p1 -- set Interface p1 type=dummy -- \
+   add-port test-br0 p2 -- set Interface p2 type=dummy -- \
+   add-port test-br0 p3 -- set Interface p3 type=dummy])
 
 arp='eth_type(0x0806),arp(sip=192.168.0.1,tip=192.168.0.2,op=1,sha=50:54:00:00:00:05,tha=00:00:00:00:00:00)'
 
 # Trace an ARP packet arriving on p3, to create a MAC learning entry.
 OFPROTO_TRACE(
-  [br0],
+  [test-br0],
   [in_port(3),eth(src=50:54:00:00:00:05,dst=ff:ff:ff:ff:ff:ff),$arp],
   [-generate],
-  [0,1,2])
+  [1,2,100])
 
 # Check for the MAC learning entry.
-AT_CHECK_UNQUOTED([ovs-appctl fdb/show br0 | sed 's/[[0-9]]\{1,\}$/?/'], [0], [dnl
+AT_CHECK_UNQUOTED([ovs-appctl fdb/show test-br0 | sed 's/[[0-9]]\{1,\}$/?/'], [0], [dnl
  port  VLAN  MAC                Age
     3     0  50:54:00:00:00:05    ?
 ])
@@ -863,13 +862,13 @@ AT_CHECK_UNQUOTED([ovs-appctl fdb/show br0 | sed 's/[[0-9]]\{1,\}$/?/'], [0], [d
 # Trace a packet arrival destined for the learned MAC.
 # (This will also learn a MAC.)
 OFPROTO_TRACE(
-  [br0],
+  [test-br0],
   [in_port(1),eth(src=50:54:00:00:00:06,dst=50:54:00:00:00:05),$arp],
   [-generate],
   [3])
 
 # Check for both MAC learning entries.
-AT_CHECK_UNQUOTED([ovs-appctl fdb/show br0 | sed 's/[[0-9]]\{1,\}$/?/'], [0], [dnl
+AT_CHECK_UNQUOTED([ovs-appctl fdb/show test-br0 | sed 's/[[0-9]]\{1,\}$/?/'], [0], [dnl
  port  VLAN  MAC                Age
     3     0  50:54:00:00:00:05    ?
     1     0  50:54:00:00:00:06    ?
@@ -877,13 +876,13 @@ AT_CHECK_UNQUOTED([ovs-appctl fdb/show br0 | sed 's/[[0-9]]\{1,\}$/?/'], [0], [d
 
 # Trace a packet arrival that updates the first learned MAC entry.
 OFPROTO_TRACE(
-  [br0],
+  [test-br0],
   [in_port(2),eth(src=50:54:00:00:00:05,dst=ff:ff:ff:ff:ff:ff),$arp],
   [-generate],
-  [0,1,3])
+  [1,3,100])
 
 # Check that the MAC learning entry was updated.
-AT_CHECK_UNQUOTED([ovs-appctl fdb/show br0 | sed 's/[[0-9]]\{1,\}$/?/'], [0], [dnl
+AT_CHECK_UNQUOTED([ovs-appctl fdb/show test-br0 | sed 's/[[0-9]]\{1,\}$/?/'], [0], [dnl
  port  VLAN  MAC                Age
     1     0  50:54:00:00:00:06    ?
     2     0  50:54:00:00:00:05    ?
@@ -892,38 +891,40 @@ AT_CHECK_UNQUOTED([ovs-appctl fdb/show br0 | sed 's/[[0-9]]\{1,\}$/?/'], [0], [d
 # Add another bridge.
 AT_CHECK(
   [ovs-vsctl \
-     -- add-br br1 \
-     -- set bridge br1 datapath-type=dummy \
-     -- add-port br1 p4 -- set interface p4 type=dummy \
-     -- add-port br1 p5 -- set interface p5 type=dummy])
+     -- add-br test-br1 \
+     -- set bridge test-br1 datapath-type=dummy \
+     -- add-port test-br1 p4 -- set interface p4 type=dummy \
+     -- add-port test-br1 p5 -- set interface p5 type=dummy])
 
-# Trace some packet arrivals in br1 to create MAC learning entries there too.
+# Trace some packet arrivals in test-br1 to create MAC learning entries
+# there too.
 OFPROTO_TRACE(
-  [br1],
+  [test-br1],
   [in_port(4),eth(src=50:54:00:00:00:06,dst=ff:ff:ff:ff:ff:ff),$arp],
   [-generate],
-  [0,5])
+  [5,101])
 OFPROTO_TRACE(
-  [br1],
+  [test-br1],
   [in_port(5),eth(src=50:54:00:00:00:07,dst=ff:ff:ff:ff:ff:ff),$arp],
   [-generate],
-  [0,4])
+  [4,101])
 
 # Check that the MAC learning entries were added.
-AT_CHECK_UNQUOTED([ovs-appctl fdb/show br1 | sed 's/[[0-9]]\{1,\}$/?/'], [0], [dnl
+AT_CHECK_UNQUOTED([ovs-appctl fdb/show test-br1 | sed 's/[[0-9]]\{1,\}$/?/'], [0], [dnl
  port  VLAN  MAC                Age
     4     0  50:54:00:00:00:06    ?
     5     0  50:54:00:00:00:07    ?
 ])
 
 # Delete port p1 and see that its MAC learning entry disappeared, and
-# that the MAC learning entry for the same MAC was also deleted from br1.
+# that the MAC learning entry for the same MAC was also deleted from
+# test-br1.
 AT_CHECK([ovs-vsctl del-port p1])
-AT_CHECK_UNQUOTED([ovs-appctl fdb/show br0 | sed 's/[[0-9]]\{1,\}$/?/'], [0], [dnl
+AT_CHECK_UNQUOTED([ovs-appctl fdb/show test-br0 | sed 's/[[0-9]]\{1,\}$/?/'], [0], [dnl
  port  VLAN  MAC                Age
     2     0  50:54:00:00:00:05    ?
 ])
-AT_CHECK_UNQUOTED([ovs-appctl fdb/show br1 | sed 's/[[0-9]]\{1,\}$/?/'], [0], [dnl
+AT_CHECK_UNQUOTED([ovs-appctl fdb/show test-br1 | sed 's/[[0-9]]\{1,\}$/?/'], [0], [dnl
  port  VLAN  MAC                Age
     5     0  50:54:00:00:00:07    ?
 ])
@@ -942,10 +943,10 @@ AT_CHECK([perl $srcdir/choose-port.pl], [0], [stdout])
 NETFLOW_PORT=`cat stdout`
 
 OVS_VSWITCHD_START(
-  [set Bridge br0 fail-mode=standalone -- \
-   add-port br0 p1 -- set Interface p1 type=dummy -- \
-   add-port br0 p2 -- set Interface p2 type=dummy -- \
-   set Bridge br0 netflow=@nf -- \
+  [set Bridge test-br0 fail-mode=standalone -- \
+   add-port test-br0 p1 -- set Interface p1 type=dummy -- \
+   add-port test-br0 p2 -- set Interface p2 type=dummy -- \
+   set Bridge test-br0 netflow=@nf -- \
    --id=@nf create NetFlow targets=\"127.0.0.1:$NETFLOW_PORT\" \
      engine_id=1 engine_type=2 active_timeout=30 \
      add-id-to-interface=false], [<0>
@@ -987,10 +988,10 @@ AT_CHECK([perl $srcdir/choose-port.pl], [0], [stdout])
 NETFLOW_PORT=`cat stdout`
 
 OVS_VSWITCHD_START(
-  [set Bridge br0 fail-mode=standalone -- \
-   add-port br0 p1 -- set Interface p1 type=dummy -- \
-   add-port br0 p2 -- set Interface p2 type=dummy -- \
-   set Bridge br0 netflow=@nf -- \
+  [set Bridge test-br0 fail-mode=standalone -- \
+   add-port test-br0 p1 -- set Interface p1 type=dummy -- \
+   add-port test-br0 p2 -- set Interface p2 type=dummy -- \
+   set Bridge test-br0 netflow=@nf -- \
    --id=@nf create NetFlow targets=\"127.0.0.1:$NETFLOW_PORT\" \
      engine_id=1 engine_type=2 active_timeout=10 \
      add-id-to-interface=false], [<0>
@@ -1076,7 +1077,7 @@ OVS_VSWITCHD_START
 # HARD to "none".  If idle_age doesn't appear in the output, sets IDLE
 # to 0.
 get_ages () {
-    AT_CHECK([ovs-ofctl dump-flows br0], [0], [stdout])
+    AT_CHECK([ovs-ofctl dump-flows test-br0], [0], [stdout])
 
     duration=`sed -n 's/.*duration=\([[0-9]]*\)\(\.[[0-9]]*\)\{0,1\}s.*/\1/p' stdout`
     AT_CHECK([[expr X"$duration" : 'X[0-9][0-9]*$']], [0], [ignore])
@@ -1100,13 +1101,13 @@ get_ages () {
 }
 
 # Add a flow and get its initial hard and idle age.
-AT_CHECK([ovs-ofctl add-flow br0 hard_timeout=199,idle_timeout=188,actions=drop])
+AT_CHECK([ovs-ofctl add-flow test-br0 hard_timeout=199,idle_timeout=188,actions=drop])
 get_ages duration1 hard1 idle1
 
 # Warp time forward by 10 seconds, then modify the flow's actions.
 ovs-appctl time/warp 10000
 get_ages duration2 hard2 idle2
-AT_CHECK([ovs-ofctl mod-flows br0 actions=flood])
+AT_CHECK([ovs-ofctl mod-flows test-br0 actions=flood])
 
 # Warp time forward by 10 seconds.
 ovs-appctl time/warp 10000
@@ -1116,7 +1117,7 @@ get_ages duration3 hard3 idle3
 # then warp forward a few more times because idle times are only updated
 # occasionally.
 ovs-appctl time/warp 10000
-ovs-appctl netdev-dummy/receive br0 'in_port(0),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=80,dst=1234)'
+ovs-appctl netdev-dummy/receive test-br0 'in_port(0),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=80,dst=1234)'
 ovs-appctl time/warp 1000
 ovs-appctl time/warp 1000
 ovs-appctl time/warp 1000
@@ -1161,8 +1162,8 @@ AT_DATA([flows.txt], [dnl
 in_port=1 actions=output:2
 in_port=2 actions=mod_vlan_vid:17,output:1
 ])
-AT_CHECK([ovs-ofctl add-flow br0 'idle_timeout=60,actions=fin_timeout(idle_timeout=5)'])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip], [0],
+AT_CHECK([ovs-ofctl add-flow test-br0 'idle_timeout=60,actions=fin_timeout(idle_timeout=5)'])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip], [0],
 [NXST_FLOW reply:
  idle_timeout=60, actions=fin_timeout(idle_timeout=5)
 ])
@@ -1170,22 +1171,22 @@ AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip], [0],
 # flow stats updates are mainly what implements the fin_timeout
 # feature, we warp forward a couple of times to ensure that flow stats
 # run before re-checking the flow table.)
-AT_CHECK([ovs-appctl netdev-dummy/receive br0 0021853763af0026b98cb0f908004500003c2e2440004006465dac11370dac11370b828b0016751e267b00000000a00216d017360000020405b40402080a2d25085f0000000001030307], [0], [success
+AT_CHECK([ovs-appctl netdev-dummy/receive test-br0 0021853763af0026b98cb0f908004500003c2e2440004006465dac11370dac11370b828b0016751e267b00000000a00216d017360000020405b40402080a2d25085f0000000001030307], [0], [success
 ])
 AT_CHECK([ovs-appctl time/warp 1000 && ovs-appctl time/warp 1000], [0], [warped
 warped
 ])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip], [0],
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip], [0],
 [NXST_FLOW reply:
  n_packets=1, n_bytes=74, idle_timeout=60, actions=fin_timeout(idle_timeout=5)
 ])
 # Check that a TCP FIN packet does change the timeout.
-AT_CHECK([ovs-appctl netdev-dummy/receive br0 0021853763af0026b98cb0f90800451000342e3e40004006463bac11370dac11370b828b0016751e319dfc96399b801100717ae800000101080a2d250a9408579588], [0], [success
+AT_CHECK([ovs-appctl netdev-dummy/receive test-br0 0021853763af0026b98cb0f90800451000342e3e40004006463bac11370dac11370b828b0016751e319dfc96399b801100717ae800000101080a2d250a9408579588], [0], [success
 ])
 AT_CHECK([ovs-appctl time/warp 1000 && ovs-appctl time/warp 1000], [0], [warped
 warped
 ])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip], [0],
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip], [0],
 [NXST_FLOW reply:
  n_packets=2, n_bytes=140, idle_timeout=5, actions=fin_timeout(idle_timeout=5)
 ])
diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at
index 037fb9c..1fe8f8d 100644
--- a/tests/ofproto-macros.at
+++ b/tests/ofproto-macros.at
@@ -24,7 +24,7 @@ m4_define([TESTABLE_LOG], [-vPATTERN:ANY:'%c|%p|%m'])
 #
 # Creates a database and starts ovsdb-server, starts ovs-vswitchd
 # connected to that database, calls ovs-vsctl to create a bridge named
-# br0 with predictable settings, passing 'vsctl-args' as additional
+# test-br0 with predictable settings, passing 'vsctl-args' as additional
 # commands to ovs-vsctl.  If 'vsctl-args' causes ovs-vsctl to provide
 # output (e.g. because it includes "create" commands) then 'vsctl-output'
 # specifies the expected output after filtering through uuidfilt.pl.
@@ -60,7 +60,7 @@ m4_define([OVS_VSWITCHD_START],
 /ofproto|INFO|datapath ID changed to fedcba9876543210/d']])
 
    dnl Add bridges, ports, etc.
-   AT_CHECK([ovs-vsctl -- add-br br0 -- set bridge br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 fail-mode=secure -- $1 m4_if([$2], [], [], [| perl $srcdir/uuidfilt.pl])], [0], [$2])
+   AT_CHECK([ovs-vsctl -- add-br test-br0 -- set bridge test-br0 datapath-type=dummy other-config:datapath-id=fedcba9876543210 other-config:hwaddr=aa:55:aa:55:00:00 fail-mode=secure -- $1 m4_if([$2], [], [], [| perl $srcdir/uuidfilt.pl])], [0], [$2])
 ])
 
 m4_define([OVS_VSWITCHD_STOP],
diff --git a/tests/ofproto.at b/tests/ofproto.at
index 6bcc2ba..3131395 100644
--- a/tests/ofproto.at
+++ b/tests/ofproto.at
@@ -2,19 +2,19 @@ AT_BANNER([ofproto])
 
 AT_SETUP([ofproto - echo request])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl -vwarn probe br0])
+AT_CHECK([ovs-ofctl -vwarn probe test-br0])
 OVS_VSWITCHD_STOP
 AT_CLEANUP
 
 AT_SETUP([ofproto - feature request, config request])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl -vwarn show br0], [0], [stdout])
+AT_CHECK([ovs-ofctl -vwarn show test-br0], [0], [stdout])
 AT_CHECK([STRIP_XIDS stdout], [0], [dnl
 OFPT_FEATURES_REPLY: dpid:fedcba9876543210
 n_tables:255, n_buffers:256
 capabilities: FLOW_STATS TABLE_STATS PORT_STATS QUEUE_STATS ARP_MATCH_IP
 actions: OUTPUT SET_VLAN_VID SET_VLAN_PCP STRIP_VLAN SET_DL_SRC SET_DL_DST SET_NW_SRC SET_NW_DST SET_NW_TOS SET_TP_SRC SET_TP_DST ENQUEUE
- LOCAL(br0): addr:aa:55:aa:55:00:00
+ LOCAL(test-br0): addr:aa:55:aa:55:00:00
      config:     PORT_DOWN
      state:      LINK_DOWN
      speed: 100 Mbps now, 100 Mbps max
@@ -25,28 +25,32 @@ AT_CLEANUP
 
 AT_SETUP([ofproto - set OpenFlow port number])
 OVS_VSWITCHD_START(
-       [add-port br0 p1 -- set Interface p1 type=dummy --\
-        add-port br0 p2 -- set Interface p2 type=dummy ofport_request=99])
-AT_CHECK([ovs-ofctl -vwarn show br0], [0], [stdout])
-AT_CHECK([STRIP_XIDS stdout], [0], [dnl
+       [add-port test-br0 p1 -- set Interface p1 type=dummy --\
+        add-port test-br0 p2 -- set Interface p2 type=dummy ofport_request=99])
+AT_CHECK([ovs-ofctl -vwarn show test-br0], [0], [stdout])
+AT_CHECK([[sed '
+s/ (xid=0x[0-9a-fA-F]*)//
+s/00:0.$/00:0x/' < stdout]],
+      [0], [dnl
 OFPT_FEATURES_REPLY: dpid:fedcba9876543210
 n_tables:255, n_buffers:256
 capabilities: FLOW_STATS TABLE_STATS PORT_STATS QUEUE_STATS ARP_MATCH_IP
 actions: OUTPUT SET_VLAN_VID SET_VLAN_PCP STRIP_VLAN SET_DL_SRC SET_DL_DST SET_NW_SRC SET_NW_DST SET_NW_TOS SET_TP_SRC SET_TP_DST ENQUEUE
- 1(p1): addr:aa:55:aa:55:00:01
+ 1(p1): addr:aa:55:aa:55:00:0x
      config:     PORT_DOWN
      state:      LINK_DOWN
      speed: 100 Mbps now, 100 Mbps max
- 99(p2): addr:aa:55:aa:55:00:02
+ 99(p2): addr:aa:55:aa:55:00:0x
      config:     PORT_DOWN
      state:      LINK_DOWN
      speed: 100 Mbps now, 100 Mbps max
- LOCAL(br0): addr:aa:55:aa:55:00:00
+ LOCAL(test-br0): addr:aa:55:aa:55:00:0x
      config:     PORT_DOWN
      state:      LINK_DOWN
      speed: 100 Mbps now, 100 Mbps max
 OFPT_GET_CONFIG_REPLY: frags=normal miss_send_len=0
 ])
+
 OVS_VSWITCHD_STOP
 AT_CLEANUP
 
@@ -54,7 +58,7 @@ dnl This is really bare-bones.
 dnl It at least checks request and reply serialization and deserialization.
 AT_SETUP([ofproto - port stats])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl -vwarn dump-ports br0], [0], [stdout])
+AT_CHECK([ovs-ofctl -vwarn dump-ports test-br0], [0], [stdout])
 AT_CHECK([STRIP_XIDS stdout], [0], [dnl
 OFPST_PORT reply: 1 ports
   port 65534: rx pkts=0, bytes=0, drop=0, errs=0, frame=0, over=0, crc=0
@@ -67,10 +71,10 @@ dnl This is really bare-bones.
 dnl It at least checks request and reply serialization and deserialization.
 AT_SETUP([ofproto - port-desc stats])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl -vwarn dump-ports-desc br0], [0], [stdout])
+AT_CHECK([ovs-ofctl -vwarn dump-ports-desc test-br0], [0], [stdout])
 AT_CHECK([STRIP_XIDS stdout], [0], [dnl
 OFPST_PORT_DESC reply:
- LOCAL(br0): addr:aa:55:aa:55:00:00
+ LOCAL(test-br0): addr:aa:55:aa:55:00:00
      config:     PORT_DOWN
      state:      LINK_DOWN
      speed: 100 Mbps now, 100 Mbps max
@@ -82,15 +86,15 @@ dnl This is really bare-bones.
 dnl It at least checks request and reply serialization and deserialization.
 AT_SETUP([ofproto - queue stats])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl -vwarn queue-stats br0], [0], [stdout])
+AT_CHECK([ovs-ofctl -vwarn queue-stats test-br0], [0], [stdout])
 AT_CHECK([STRIP_XIDS stdout], [0], [dnl
 OFPST_QUEUE reply: 0 queues
 ])
-AT_CHECK([ovs-ofctl -vwarn queue-stats br0 ALL 5], [0],
+AT_CHECK([ovs-ofctl -vwarn queue-stats test-br0 ALL 5], [0],
   [OFPT_ERROR (xid=0x2): OFPQOFC_BAD_QUEUE
 OFPST_QUEUE request (xid=0x2):port=ALL queue=5
 ])
-AT_CHECK([ovs-ofctl -vwarn queue-stats br0 10], [0],
+AT_CHECK([ovs-ofctl -vwarn queue-stats test-br0 10], [0],
   [OFPT_ERROR (xid=0x2): OFPQOFC_BAD_PORT
 OFPST_QUEUE request (xid=0x2):port=10 queue=ALL
 ])
@@ -114,14 +118,14 @@ for command_config_state in \
 do
     set $command_config_state
     command=$[1] config=`echo $[2] | sed 's/,/ /g'` state=$[3]
-    AT_CHECK([ovs-ofctl -vwarn mod-port br0 br0 $command])
-    AT_CHECK([ovs-ofctl -vwarn show br0], [0], [stdout])
+    AT_CHECK([ovs-ofctl -vwarn mod-port test-br0 test-br0 $command])
+    AT_CHECK([ovs-ofctl -vwarn show test-br0], [0], [stdout])
     AT_CHECK_UNQUOTED([STRIP_XIDS stdout], [0], [dnl
 OFPT_FEATURES_REPLY: dpid:fedcba9876543210
 n_tables:255, n_buffers:256
 capabilities: FLOW_STATS TABLE_STATS PORT_STATS QUEUE_STATS ARP_MATCH_IP
 actions: OUTPUT SET_VLAN_VID SET_VLAN_PCP STRIP_VLAN SET_DL_SRC SET_DL_DST SET_NW_SRC SET_NW_DST SET_NW_TOS SET_TP_SRC SET_TP_DST ENQUEUE
- LOCAL(br0): addr:aa:55:aa:55:00:00
+ LOCAL(test-br0): addr:aa:55:aa:55:00:00
      config:     $config
      state:      $state
      speed: 100 Mbps now, 100 Mbps max
@@ -133,53 +137,53 @@ AT_CLEANUP
 
 AT_SETUP([ofproto - basic flow_mod commands (NXM)])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip], [0], [NXST_FLOW reply:
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip], [0], [NXST_FLOW reply:
 ])
-AT_CHECK([echo 'in_port=2,actions=1' | ovs-ofctl add-flows br0 -])
-AT_CHECK([ovs-ofctl add-flow br0 in_port=1,actions=2])
-AT_CHECK([ovs-ofctl -F nxm add-flow br0 table=1,in_port=4,actions=3])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([echo 'in_port=2,actions=1' | ovs-ofctl add-flows test-br0 -])
+AT_CHECK([ovs-ofctl add-flow test-br0 in_port=1,actions=2])
+AT_CHECK([ovs-ofctl -F nxm add-flow test-br0 table=1,in_port=4,actions=3])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  in_port=1 actions=output:2
  in_port=2 actions=output:1
  table=1, in_port=4 actions=output:3
 NXST_FLOW reply:
 ])
-AT_CHECK([ovs-ofctl dump-aggregate br0 table=0 | STRIP_XIDS], [0], [dnl
+AT_CHECK([ovs-ofctl dump-aggregate test-br0 table=0 | STRIP_XIDS], [0], [dnl
 NXST_AGGREGATE reply: packet_count=0 byte_count=0 flow_count=2
 ])
-AT_CHECK([ovs-ofctl del-flows br0])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip], [0], [NXST_FLOW reply:
+AT_CHECK([ovs-ofctl del-flows test-br0])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip], [0], [NXST_FLOW reply:
 ])
 OVS_VSWITCHD_STOP
 AT_CLEANUP
 
 AT_SETUP([ofproto - basic flow_mod commands (OpenFlow 1.0)])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip], [0], [OFPST_FLOW reply:
+AT_CHECK([ovs-ofctl -F openflow10 dump-flows test-br0 | ofctl_strip], [0], [OFPST_FLOW reply:
 ])
-AT_CHECK([echo 'in_port=2,actions=1' | ovs-ofctl -F openflow10 add-flows br0 -])
-AT_CHECK([ovs-ofctl -F openflow10 add-flow br0 in_port=1,actions=2])
-AT_CHECK([ovs-ofctl -F openflow10 add-flow br0 table=1,in_port=4,actions=3])
-AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([echo 'in_port=2,actions=1' | ovs-ofctl -F openflow10 add-flows test-br0 -])
+AT_CHECK([ovs-ofctl -F openflow10 add-flow test-br0 in_port=1,actions=2])
+AT_CHECK([ovs-ofctl -F openflow10 add-flow test-br0 table=1,in_port=4,actions=3])
+AT_CHECK([ovs-ofctl -F openflow10 dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  in_port=1 actions=output:2
  in_port=2 actions=output:1
  table=1, in_port=4 actions=output:3
 OFPST_FLOW reply:
 ])
-AT_CHECK([ovs-ofctl -F openflow10 dump-aggregate br0 table=0 | STRIP_XIDS], [0], [dnl
+AT_CHECK([ovs-ofctl -F openflow10 dump-aggregate test-br0 table=0 | STRIP_XIDS], [0], [dnl
 OFPST_AGGREGATE reply: packet_count=0 byte_count=0 flow_count=2
 ])
-AT_CHECK([ovs-ofctl -F openflow10 del-flows br0])
-AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip], [0], [OFPST_FLOW reply:
+AT_CHECK([ovs-ofctl -F openflow10 del-flows test-br0])
+AT_CHECK([ovs-ofctl -F openflow10 dump-flows test-br0 | ofctl_strip], [0], [OFPST_FLOW reply:
 ])
 OVS_VSWITCHD_STOP
 AT_CLEANUP
 
 AT_SETUP([ofproto - set-field flow_mod commands (NXM)])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl add-flow br0 ipv6,table=1,in_port=3,actions=drop])
-AT_CHECK([ovs-ofctl add-flow br0 ipv6,table=1,in_port=3,actions=set_field:fe80:0123:4567:890a:a6ba:dbff:fefe:59fa-\>ipv6_src])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl add-flow test-br0 ipv6,table=1,in_port=3,actions=drop])
+AT_CHECK([ovs-ofctl add-flow test-br0 ipv6,table=1,in_port=3,actions=set_field:fe80:0123:4567:890a:a6ba:dbff:fefe:59fa-\>ipv6_src])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  table=1, ipv6,in_port=3 actions=load:0xa6badbfffefe59fa->NXM_NX_IPV6_SRC[[0..63]],load:0xfe8001234567890a->NXM_NX_IPV6_SRC[[64..127]]
 NXST_FLOW reply:
 ])
@@ -188,23 +192,23 @@ AT_CLEANUP
 
 AT_SETUP([ofproto - dump flows with cookie])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1])
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=1])
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=1])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x1,in_port=1,actions=1])
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x2,in_port=2,actions=1])
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x3,in_port=3,actions=1])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x1, in_port=1 actions=output:1
  cookie=0x2, in_port=2 actions=output:1
  cookie=0x3, in_port=3 actions=output:1
 NXST_FLOW reply:
 ])
-AT_CHECK([ovs-ofctl dump-aggregate br0 table=0 | STRIP_XIDS], [0], [dnl
+AT_CHECK([ovs-ofctl dump-aggregate test-br0 table=0 | STRIP_XIDS], [0], [dnl
 NXST_AGGREGATE reply: packet_count=0 byte_count=0 flow_count=3
 ])
-AT_CHECK([ovs-ofctl dump-flows br0 cookie=0x3/-1 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl dump-flows test-br0 cookie=0x3/-1 | ofctl_strip | sort], [0], [dnl
  cookie=0x3, in_port=3 actions=output:1
 NXST_FLOW reply:
 ])
-AT_CHECK([ovs-ofctl dump-aggregate br0 cookie=0x3/-1 | STRIP_XIDS], [0], [dnl
+AT_CHECK([ovs-ofctl dump-aggregate test-br0 cookie=0x3/-1 | STRIP_XIDS], [0], [dnl
 NXST_AGGREGATE reply: packet_count=0 byte_count=0 flow_count=1
 ])
 OVS_VSWITCHD_STOP
@@ -212,24 +216,24 @@ AT_CLEANUP
 
 AT_SETUP([ofproto - dump flows with cookie mask])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1])
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=1])
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=1])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x1,in_port=1,actions=1])
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x2,in_port=2,actions=1])
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x3,in_port=3,actions=1])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x1, in_port=1 actions=output:1
  cookie=0x2, in_port=2 actions=output:1
  cookie=0x3, in_port=3 actions=output:1
 NXST_FLOW reply:
 ])
-AT_CHECK([ovs-ofctl dump-aggregate br0 table=0 | STRIP_XIDS], [0], [dnl
+AT_CHECK([ovs-ofctl dump-aggregate test-br0 table=0 | STRIP_XIDS], [0], [dnl
 NXST_AGGREGATE reply: packet_count=0 byte_count=0 flow_count=3
 ])
-AT_CHECK([ovs-ofctl dump-flows br0 cookie=0x3/0x1 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl dump-flows test-br0 cookie=0x3/0x1 | ofctl_strip | sort], [0], [dnl
  cookie=0x1, in_port=1 actions=output:1
  cookie=0x3, in_port=3 actions=output:1
 NXST_FLOW reply:
 ])
-AT_CHECK([ovs-ofctl dump-aggregate br0 cookie=0x3/0x1 | STRIP_XIDS], [0], [dnl
+AT_CHECK([ovs-ofctl dump-aggregate test-br0 cookie=0x3/0x1 | STRIP_XIDS], [0], [dnl
 NXST_AGGREGATE reply: packet_count=0 byte_count=0 flow_count=2
 ])
 OVS_VSWITCHD_STOP
@@ -237,14 +241,14 @@ AT_CLEANUP
 
 AT_SETUP([ofproto - mod flow with cookie change (OpenFlow 1.0)])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl -F openflow10 add-flow br0 cookie=0x1,in_port=1,actions=1])
-AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl -F openflow10 add-flow test-br0 cookie=0x1,in_port=1,actions=1])
+AT_CHECK([ovs-ofctl -F openflow10 dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x1, in_port=1 actions=output:1
 OFPST_FLOW reply:
 ])
 
-AT_CHECK([ovs-ofctl -F openflow10 mod-flows br0 cookie=0x2,in_port=1,actions=1])
-AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl -F openflow10 mod-flows test-br0 cookie=0x2,in_port=1,actions=1])
+AT_CHECK([ovs-ofctl -F openflow10 dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x2, in_port=1 actions=output:1
 OFPST_FLOW reply:
 ])
@@ -253,14 +257,14 @@ AT_CLEANUP
 
 AT_SETUP([ofproto - mod flow with cookie change (NXM)])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl -F nxm add-flow br0 cookie=0x1,in_port=1,actions=1])
-AT_CHECK([ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl -F nxm add-flow test-br0 cookie=0x1,in_port=1,actions=1])
+AT_CHECK([ovs-ofctl -F nxm dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x1, in_port=1 actions=output:1
 NXST_FLOW reply:
 ])
 
-AT_CHECK([ovs-ofctl -F nxm mod-flows br0 cookie=0x2,in_port=1,actions=1])
-AT_CHECK([ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl -F nxm mod-flows test-br0 cookie=0x2,in_port=1,actions=1])
+AT_CHECK([ovs-ofctl -F nxm dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x2, in_port=1 actions=output:1
 NXST_FLOW reply:
 ])
@@ -269,18 +273,18 @@ AT_CLEANUP
 
 AT_SETUP([ofproto - mod flows based on cookie mask])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1])
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x1,in_port=2,actions=1])
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x2,in_port=3,actions=1])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x1,in_port=1,actions=1])
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x1,in_port=2,actions=1])
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x2,in_port=3,actions=1])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x1, in_port=1 actions=output:1
  cookie=0x1, in_port=2 actions=output:1
  cookie=0x2, in_port=3 actions=output:1
 NXST_FLOW reply:
 ])
 
-AT_CHECK([ovs-ofctl -F nxm mod-flows br0 cookie=0x1/0xff,actions=4])
-AT_CHECK([ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl -F nxm mod-flows test-br0 cookie=0x1/0xff,actions=4])
+AT_CHECK([ovs-ofctl -F nxm dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x1, in_port=1 actions=output:4
  cookie=0x1, in_port=2 actions=output:4
  cookie=0x2, in_port=3 actions=output:1
@@ -291,18 +295,18 @@ AT_CLEANUP
 
 AT_SETUP([ofproto - mod flows based on cookie mask with cookie change])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1])
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x1,in_port=2,actions=1])
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x2,in_port=3,actions=1])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x1,in_port=1,actions=1])
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x1,in_port=2,actions=1])
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x2,in_port=3,actions=1])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x1, in_port=1 actions=output:1
  cookie=0x1, in_port=2 actions=output:1
  cookie=0x2, in_port=3 actions=output:1
 NXST_FLOW reply:
 ])
 
-AT_CHECK([ovs-ofctl -F nxm mod-flows br0 cookie=1/-1,cookie=4,actions=4])
-AT_CHECK([ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl -F nxm mod-flows test-br0 cookie=1/-1,cookie=4,actions=4])
+AT_CHECK([ovs-ofctl -F nxm dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x2, in_port=3 actions=output:1
  cookie=0x4, in_port=1 actions=output:4
  cookie=0x4, in_port=2 actions=output:4
@@ -313,8 +317,8 @@ AT_CLEANUP
 
 AT_SETUP([ofproto - mod flow with cookie miss (mask==0)])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl -F nxm mod-flows br0 in_port=1,actions=1])
-AT_CHECK([ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl -F nxm mod-flows test-br0 in_port=1,actions=1])
+AT_CHECK([ovs-ofctl -F nxm dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  in_port=1 actions=output:1
 NXST_FLOW reply:
 ])
@@ -323,8 +327,8 @@ AT_CLEANUP
 
 AT_SETUP([ofproto - mod flow with cookie miss (mask!=0)])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl -F nxm mod-flows br0 cookie=1/1,in_port=1,actions=1])
-AT_CHECK([ovs-ofctl -F nxm dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl -F nxm mod-flows test-br0 cookie=1/1,in_port=1,actions=1])
+AT_CHECK([ovs-ofctl -F nxm dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
 NXST_FLOW reply:
 ])
 OVS_VSWITCHD_STOP
@@ -332,18 +336,18 @@ AT_CLEANUP
 
 AT_SETUP([ofproto - del flows with cookies])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1])
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=1])
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=1])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x1,in_port=1,actions=1])
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x2,in_port=2,actions=1])
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x3,in_port=3,actions=1])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x1, in_port=1 actions=output:1
  cookie=0x2, in_port=2 actions=output:1
  cookie=0x3, in_port=3 actions=output:1
 NXST_FLOW reply:
 ])
 
-AT_CHECK([ovs-ofctl del-flows br0])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl del-flows test-br0])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
 NXST_FLOW reply:
 ])
 OVS_VSWITCHD_STOP
@@ -351,18 +355,18 @@ AT_CLEANUP
 
 AT_SETUP([ofproto - del flows based on cookie])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1])
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=1])
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=1])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x1,in_port=1,actions=1])
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x2,in_port=2,actions=1])
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x3,in_port=3,actions=1])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x1, in_port=1 actions=output:1
  cookie=0x2, in_port=2 actions=output:1
  cookie=0x3, in_port=3 actions=output:1
 NXST_FLOW reply:
 ])
 
-AT_CHECK([ovs-ofctl del-flows br0 cookie=0x3/-1])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl del-flows test-br0 cookie=0x3/-1])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x1, in_port=1 actions=output:1
  cookie=0x2, in_port=2 actions=output:1
 NXST_FLOW reply:
@@ -372,17 +376,17 @@ AT_CLEANUP
 
 AT_SETUP([ofproto - del flows based on cookie mask])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1])
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x2,in_port=2,actions=1])
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x3,in_port=3,actions=1])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x1,in_port=1,actions=1])
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x2,in_port=2,actions=1])
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x3,in_port=3,actions=1])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x1, in_port=1 actions=output:1
  cookie=0x2, in_port=2 actions=output:1
  cookie=0x3, in_port=3 actions=output:1
 NXST_FLOW reply:
 ])
-AT_CHECK([ovs-ofctl del-flows br0 cookie=0x3/0x1])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl del-flows test-br0 cookie=0x3/0x1])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x2, in_port=2 actions=output:1
 NXST_FLOW reply:
 ])
@@ -391,31 +395,31 @@ AT_CLEANUP
 
 AT_SETUP([ofproto - del flows based on table id])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1])
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x2,in_port=2,table=1,actions=1])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x1,in_port=1,actions=1])
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x2,in_port=2,table=1,actions=1])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x1, in_port=1 actions=output:1
  cookie=0x2, table=1, in_port=2 actions=output:1
 NXST_FLOW reply:
 ])
-AT_CHECK([ovs-ofctl del-flows br0 table=0])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl del-flows test-br0 table=0])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x2, table=1, in_port=2 actions=output:1
 NXST_FLOW reply:
 ])
-AT_CHECK([ovs-ofctl del-flows br0 table=1])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl del-flows test-br0 table=1])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
 NXST_FLOW reply:
 ])
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x1,in_port=1,actions=1])
-AT_CHECK([ovs-ofctl add-flow br0 cookie=0x2,in_port=2,table=1,actions=1])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x1,in_port=1,actions=1])
+AT_CHECK([ovs-ofctl add-flow test-br0 cookie=0x2,in_port=2,table=1,actions=1])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  cookie=0x1, in_port=1 actions=output:1
  cookie=0x2, table=1, in_port=2 actions=output:1
 NXST_FLOW reply:
 ])
-AT_CHECK([ovs-ofctl del-flows br0])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl del-flows test-br0])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
 NXST_FLOW reply:
 ])
 OVS_VSWITCHD_STOP
@@ -436,13 +440,13 @@ OVS_VSWITCHD_START
  done
  echo "  254: table254: wild=0x3fffff, max=1000000, active=2
                lookup=0, matched=0") > expout
-AT_CHECK([ovs-ofctl dump-tables br0], [0], [expout])
+AT_CHECK([ovs-ofctl dump-tables test-br0], [0], [expout])
 # Change the configuration.
 AT_CHECK(
   [ovs-vsctl \
      -- --id=@t0 create Flow_Table name=main \
      -- --id=@t1 create Flow_Table flow-limit=1024 \
-     -- set bridge br0 'flow_tables={1=@t1,0=@t0}' \
+     -- set bridge test-br0 'flow_tables={1=@t1,0=@t0}' \
    | perl $srcdir/uuidfilt.pl],
   [0], [<0>
 <1>
@@ -455,7 +459,7 @@ mv expout orig-expout
   1: table1  : wild=0x3fffff, max=  1024, active=0
                lookup=0, matched=0"
  tail -n +6 orig-expout) > expout
-AT_CHECK([ovs-ofctl dump-tables br0], [0], [expout])
+AT_CHECK([ovs-ofctl dump-tables test-br0], [0], [expout])
 OVS_VSWITCHD_STOP
 AT_CLEANUP
 
@@ -465,15 +469,15 @@ OVS_VSWITCHD_START
 AT_CHECK(
   [ovs-vsctl \
      -- --id=@t0 create Flow_Table flow-limit=4 \
-     -- set bridge br0 flow_tables:0=@t0 \
+     -- set bridge test-br0 flow_tables:0=@t0 \
    | perl $srcdir/uuidfilt.pl],
   [0], [<0>
 ])
 # Add 4 flows.
 for in_port in 1 2 3 4; do
-    ovs-ofctl add-flow br0 in_port=$in_port,actions=drop
+    ovs-ofctl add-flow test-br0 in_port=$in_port,actions=drop
 done
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  in_port=1 actions=drop
  in_port=2 actions=drop
  in_port=3 actions=drop
@@ -481,19 +485,19 @@ AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
 NXST_FLOW reply:
 ])
 # Adding another flow will be refused.
-AT_CHECK([ovs-ofctl add-flow br0 in_port=5,actions=drop], [1], [], [stderr])
+AT_CHECK([ovs-ofctl add-flow test-br0 in_port=5,actions=drop], [1], [], [stderr])
 AT_CHECK([head -n 1 stderr | ofctl_strip], [0],
   [OFPT_ERROR: OFPFMFC_TABLE_FULL
 ])
 # Also a mod-flow that would add a flow will be refused.
-AT_CHECK([ovs-ofctl mod-flows br0 in_port=5,actions=drop], [1], [], [stderr])
+AT_CHECK([ovs-ofctl mod-flows test-br0 in_port=5,actions=drop], [1], [], [stderr])
 AT_CHECK([head -n 1 stderr | ofctl_strip], [0],
   [OFPT_ERROR: OFPFMFC_TABLE_FULL
 ])
 # Replacing or modifying an existing flow is allowed.
-AT_CHECK([ovs-ofctl add-flow br0 in_port=4,actions=normal])
-AT_CHECK([ovs-ofctl mod-flows br0 in_port=3,actions=output:1])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl add-flow test-br0 in_port=4,actions=normal])
+AT_CHECK([ovs-ofctl mod-flows test-br0 in_port=3,actions=output:1])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  in_port=1 actions=drop
  in_port=2 actions=drop
  in_port=3 actions=output:1
@@ -509,15 +513,15 @@ OVS_VSWITCHD_START
 AT_CHECK(
   [ovs-vsctl \
      -- --id=@t0 create Flow_Table flow-limit=4 overflow-policy=evict \
-     -- set bridge br0 flow_tables:0=@t0 \
+     -- set bridge test-br0 flow_tables:0=@t0 \
    | perl $srcdir/uuidfilt.pl],
   [0], [<0>
 ])
 # Add 4 flows.
 for in_port in 4 3 2 1; do
-    ovs-ofctl add-flow br0 idle_timeout=${in_port}0,in_port=$in_port,actions=drop
+    ovs-ofctl add-flow test-br0 idle_timeout=${in_port}0,in_port=$in_port,actions=drop
 done
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  idle_timeout=10, in_port=1 actions=drop
  idle_timeout=20, in_port=2 actions=drop
  idle_timeout=30, in_port=3 actions=drop
@@ -525,8 +529,8 @@ AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
 NXST_FLOW reply:
 ])
 # Adding another flow will cause the one that expires soonest to be evicted.
-AT_CHECK([ovs-ofctl add-flow br0 in_port=5,actions=drop])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl add-flow test-br0 in_port=5,actions=drop])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  idle_timeout=20, in_port=2 actions=drop
  idle_timeout=30, in_port=3 actions=drop
  idle_timeout=40, in_port=4 actions=drop
@@ -535,10 +539,10 @@ NXST_FLOW reply:
 ])
 # A mod-flow that adds a flow also causes eviction, but replacing or
 # modifying an existing flow doesn't.
-AT_CHECK([ovs-ofctl mod-flows br0 in_port=6,actions=drop])
-AT_CHECK([ovs-ofctl add-flow br0 in_port=4,actions=normal])
-AT_CHECK([ovs-ofctl mod-flows br0 in_port=3,actions=output:1])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl mod-flows test-br0 in_port=6,actions=drop])
+AT_CHECK([ovs-ofctl add-flow test-br0 in_port=4,actions=normal])
+AT_CHECK([ovs-ofctl mod-flows test-br0 in_port=3,actions=output:1])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  idle_timeout=30, in_port=3 actions=output:1
  in_port=4 actions=NORMAL
  in_port=5 actions=drop
@@ -546,12 +550,12 @@ AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
 NXST_FLOW reply:
 ])
 # Flows with no timeouts at all cannot be evicted.
-AT_CHECK([ovs-ofctl add-flow br0 in_port=7,actions=normal])
-AT_CHECK([ovs-ofctl add-flow br0 in_port=8,actions=drop], [1], [], [stderr])
+AT_CHECK([ovs-ofctl add-flow test-br0 in_port=7,actions=normal])
+AT_CHECK([ovs-ofctl add-flow test-br0 in_port=8,actions=drop], [1], [], [stderr])
 AT_CHECK([head -n 1 stderr | ofctl_strip], [0],
   [OFPT_ERROR: OFPFMFC_TABLE_FULL
 ])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  in_port=4 actions=NORMAL
  in_port=5 actions=drop
  in_port=6 actions=drop
@@ -569,18 +573,18 @@ AT_CHECK(
      -- --id=@t0 create Flow_Table name=evict flow-limit=4 \
                                    overflow-policy=evict \
                                    groups='"NXM_OF_IN_PORT[[]]"' \
-     -- set bridge br0 flow_tables:0=@t0 \
+     -- set bridge test-br0 flow_tables:0=@t0 \
    | perl $srcdir/uuidfilt.pl],
   [0], [<0>
 ])
 # Add 4 flows.
-ovs-ofctl add-flows br0 - <<EOF
+ovs-ofctl add-flows test-br0 - <<EOF
 idle_timeout=10 in_port=2 dl_src=00:44:55:66:77:88 actions=drop
 idle_timeout=20 in_port=1 dl_src=00:11:22:33:44:55 actions=drop
 idle_timeout=30 in_port=1 dl_src=00:22:33:44:55:66 actions=drop
 idle_timeout=40 in_port=1 dl_src=00:33:44:55:66:77 actions=drop
 EOF
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  idle_timeout=10, in_port=2,dl_src=00:44:55:66:77:88 actions=drop
  idle_timeout=20, in_port=1,dl_src=00:11:22:33:44:55 actions=drop
  idle_timeout=30, in_port=1,dl_src=00:22:33:44:55:66 actions=drop
@@ -591,8 +595,8 @@ NXST_FLOW reply:
 # the largest group (those with in_port=1) to be evicted.  In this
 # case this is not the same as the one that expires soonest overall
 # (which is what makes the test interesting):
-AT_CHECK([ovs-ofctl add-flow br0 in_port=2,dl_src=00:55:66:77:88:99,actions=drop])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl add-flow test-br0 in_port=2,dl_src=00:55:66:77:88:99,actions=drop])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  idle_timeout=10, in_port=2,dl_src=00:44:55:66:77:88 actions=drop
  idle_timeout=30, in_port=1,dl_src=00:22:33:44:55:66 actions=drop
  idle_timeout=40, in_port=1,dl_src=00:33:44:55:66:77 actions=drop
@@ -602,12 +606,12 @@ NXST_FLOW reply:
 # Enlarge the flow limit, change the eviction policy back to strictly
 # based on expiration, and and add some flows.
 AT_CHECK([ovs-vsctl set Flow_Table evict groups='[[]]' flow-limit=7])
-ovs-ofctl add-flows br0 - <<EOF
+ovs-ofctl add-flows test-br0 - <<EOF
 idle_timeout=50 in_port=2 dl_src=00:66:77:88:99:aa actions=drop
 idle_timeout=60 in_port=2 dl_src=00:77:88:99:aa:bb actions=drop
 idle_timeout=70 in_port=2 dl_src=00:88:99:aa:bb:cc actions=drop
 EOF
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  idle_timeout=10, in_port=2,dl_src=00:44:55:66:77:88 actions=drop
  idle_timeout=30, in_port=1,dl_src=00:22:33:44:55:66 actions=drop
  idle_timeout=40, in_port=1,dl_src=00:33:44:55:66:77 actions=drop
@@ -619,8 +623,8 @@ NXST_FLOW reply:
 ])
 # Adding another flow will cause the one that expires soonest overall
 # to be evicted.
-AT_CHECK([ovs-ofctl add-flow br0 'idle_timeout=80 in_port=2 dl_src=00:99:aa:bb:cc:dd actions=drop'])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl add-flow test-br0 'idle_timeout=80 in_port=2 dl_src=00:99:aa:bb:cc:dd actions=drop'])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  idle_timeout=30, in_port=1,dl_src=00:22:33:44:55:66 actions=drop
  idle_timeout=40, in_port=1,dl_src=00:33:44:55:66:77 actions=drop
  idle_timeout=50, in_port=2,dl_src=00:66:77:88:99:aa actions=drop
@@ -633,7 +637,7 @@ NXST_FLOW reply:
 # Reducing the flow limit also causes the flows that expire soonest
 # overall to be evicted.
 AT_CHECK([ovs-vsctl set Flow_Table evict flow-limit=4])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sort], [0], [dnl
  idle_timeout=60, in_port=2,dl_src=00:77:88:99:aa:bb actions=drop
  idle_timeout=70, in_port=2,dl_src=00:88:99:aa:bb:cc actions=drop
  idle_timeout=80, in_port=2,dl_src=00:99:aa:bb:cc:dd actions=drop
@@ -645,7 +649,7 @@ AT_CLEANUP
 
 AT_SETUP([ofproto - asynchronous message control])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl -P openflow10 monitor br0 --detach --no-chdir --pidfile])
+AT_CHECK([ovs-ofctl -P openflow10 monitor test-br0 --detach --no-chdir --pidfile])
 check_async () {
     printf '\n\n--- check_async %d ---\n\n\n' $1
     shift
@@ -655,28 +659,28 @@ check_async () {
     : > expout
 
     # OFPT_PACKET_IN, OFPR_ACTION (controller_id=0)
-    ovs-ofctl -v packet-out br0 none controller '0001020304050010203040501234'
+    ovs-ofctl -v packet-out test-br0 none controller '0001020304050010203040501234'
     if test X"$1" = X"OFPR_ACTION"; then shift;
         echo >>expout "OFPT_PACKET_IN: total_len=14 in_port=NONE (via action) data_len=14 (unbuffered)
 priority:0,metadata:0,in_port:0000,tci(0) mac(00:10:20:30:40:50->00:01:02:03:04:05) type:1234"
     fi
 
     # OFPT_PACKET_IN, OFPR_NO_MATCH (controller_id=123)
-    ovs-ofctl -v packet-out br0 none 'controller(reason=no_match,id=123)' '0001020304050010203040501234'
+    ovs-ofctl -v packet-out test-br0 none 'controller(reason=no_match,id=123)' '0001020304050010203040501234'
     if test X"$1" = X"OFPR_NO_MATCH"; then shift;
         echo >>expout "OFPT_PACKET_IN: total_len=14 in_port=NONE (via no_match) data_len=14 (unbuffered)
 priority:0,metadata:0,in_port:0000,tci(0) mac(00:10:20:30:40:50->00:01:02:03:04:05) type:1234"
     fi
 
     # OFPT_PACKET_IN, OFPR_INVALID_TTL (controller_id=0)
-    ovs-ofctl packet-out br0 none dec_ttl '002583dfb4000026b98cb0f908004500003fb7e200000011339bac11370dac100002d7730035002b8f6d86fb0100000100000000000006626c702d7873066e696369726103636f6d00000f00'
+    ovs-ofctl packet-out test-br0 none dec_ttl '002583dfb4000026b98cb0f908004500003fb7e200000011339bac11370dac100002d7730035002b8f6d86fb0100000100000000000006626c702d7873066e696369726103636f6d00000f00'
     if test X"$1" = X"OFPR_INVALID_TTL"; then shift;
         echo >>expout "OFPT_PACKET_IN: total_len=76 in_port=NONE (via invalid_ttl) data_len=76 (unbuffered)
 priority:0,metadata:0,in_port:0000,tci(0) mac(00:26:b9:8c:b0:f9->00:25:83:df:b4:00) type:0800 proto:17 tos:0 ttl:0 ip(172.17.55.13->172.16.0.2) port(55155->53) udp_csum:8f6d"
     fi
 
     # OFPT_PORT_STATUS, OFPPR_ADD
-    ovs-vsctl add-port br0 test -- set Interface test type=dummy
+    ovs-vsctl add-port test-br0 test -- set Interface test type=dummy
     if test X"$1" = X"OFPPR_ADD"; then shift;
         echo >>expout "OFPT_PORT_STATUS: ADD: 1(test): addr:aa:55:aa:55:00:0x
      config:     PORT_DOWN
@@ -685,7 +689,7 @@ priority:0,metadata:0,in_port:0000,tci(0) mac(00:26:b9:8c:b0:f9->00:25:83:df:b4:
     fi
 
     # OFPT_PORT_STATUS, OFPPR_DELETE
-    ovs-vsctl del-port br0 test
+    ovs-vsctl del-port test-br0 test
     if test X"$1" = X"OFPPR_DELETE"; then shift;
         echo >>expout "OFPT_PORT_STATUS: DEL: 1(test): addr:aa:55:aa:55:00:0x
      config:     PORT_DOWN
@@ -694,8 +698,8 @@ priority:0,metadata:0,in_port:0000,tci(0) mac(00:26:b9:8c:b0:f9->00:25:83:df:b4:
     fi
 
     # OFPT_FLOW_REMOVED, OFPRR_DELETE
-    ovs-ofctl add-flow br0 send_flow_rem,actions=drop
-    ovs-ofctl --strict del-flows br0 ''
+    ovs-ofctl add-flow test-br0 send_flow_rem,actions=drop
+    ovs-ofctl --strict del-flows test-br0 ''
     if test X"$1" = X"OFPRR_DELETE"; then shift;
         echo >>expout "OFPT_FLOW_REMOVED:  reason=delete"
     fi
@@ -754,15 +758,15 @@ AT_SETUP([ofproto - packet-out from controller])
 OVS_VSWITCHD_START
 
 # Start a monitor listening for packet-ins.
-AT_CHECK([ovs-ofctl -P openflow10 monitor br0 --detach --no-chdir --pidfile])
+AT_CHECK([ovs-ofctl -P openflow10 monitor test-br0 --detach --no-chdir --pidfile])
 ovs-appctl -t ovs-ofctl ofctl/send 0109000c0123456700000080
 ovs-appctl -t ovs-ofctl ofctl/barrier
 ovs-appctl -t ovs-ofctl ofctl/set-output-file monitor.log
 AT_CAPTURE_FILE([monitor.log])
 
 # Send some packet-outs with OFPP_NONE and OFPP_CONTROLLER (65533) as in_port.
-AT_CHECK([ovs-ofctl packet-out br0 none controller '0001020304050010203040501234'])
-AT_CHECK([ovs-ofctl packet-out br0 controller controller '0001020304050010203040505678'])
+AT_CHECK([ovs-ofctl packet-out test-br0 none controller '0001020304050010203040501234'])
+AT_CHECK([ovs-ofctl packet-out test-br0 controller controller '0001020304050010203040505678'])
 
 # Stop the monitor and check its output.
 ovs-appctl -t ovs-ofctl ofctl/barrier
@@ -785,14 +789,14 @@ AT_SETUP([ofproto - packet-out with metadata (NXM)])
 OVS_VSWITCHD_START
 
 # Start a monitor listening for packet-ins.
-AT_CHECK([ovs-ofctl -P nxm monitor br0 --detach --no-chdir --pidfile])
+AT_CHECK([ovs-ofctl -P nxm monitor test-br0 --detach --no-chdir --pidfile])
 ovs-appctl -t ovs-ofctl ofctl/send 0109000c0123456700000080
 ovs-appctl -t ovs-ofctl ofctl/barrier
 ovs-appctl -t ovs-ofctl ofctl/set-output-file monitor.log
 AT_CAPTURE_FILE([monitor.log])
 
 # Send a packet-out with a load action to set some metadata, and forward to controller
-AT_CHECK([ovs-ofctl packet-out br0 none 'load(0xfafafafa5a5a5a5a->OXM_OF_METADATA[[0..63]]), controller' '0001020304050010203040501234'])
+AT_CHECK([ovs-ofctl packet-out test-br0 none 'load(0xfafafafa5a5a5a5a->OXM_OF_METADATA[[0..63]]), controller' '0001020304050010203040501234'])
 
 # Stop the monitor and check its output.
 ovs-appctl -t ovs-ofctl ofctl/barrier
@@ -811,10 +815,10 @@ AT_SETUP([ofproto - flow monitoring])
 AT_KEYWORDS([monitor])
 OVS_VSWITCHD_START
 
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=123,actions=output:1
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=123,actions=output:1
 
 # Start a monitor watching the flow table and check the initial reply.
-ovs-ofctl monitor br0 watch: --detach --no-chdir --pidfile >monitor.log 2>&1
+ovs-ofctl monitor test-br0 watch: --detach --no-chdir --pidfile >monitor.log 2>&1
 AT_CAPTURE_FILE([monitor.log])
 ovs-appctl -t ovs-ofctl ofctl/barrier
 AT_CHECK([sed 's/ (xid=0x[[1-9a-fA-F]][[0-9a-fA-F]]*)//' monitor.log], [0],
@@ -825,29 +829,29 @@ OFPT_BARRIER_REPLY:
 
 # Add, delete, and modify some flows and check the updates.
 ovs-appctl -t ovs-ofctl ofctl/set-output-file monitor.log
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=124,actions=output:2
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=123,actions=output:5
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=123,dl_vlan_pcp=0,actions=output:6
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=123,dl_vlan_pcp=1,actions=output:7
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=123,actions=output:8
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=65535,dl_vlan_pcp=0,actions=output:9
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=65535,dl_vlan_pcp=1,actions=output:10
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=65535,actions=output:11
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=8191,dl_vlan_pcp=0,actions=output:12
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=8191,dl_vlan_pcp=1,actions=output:13
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=8191,actions=output:14
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=0,dl_vlan_pcp=0,actions=output:15
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=0,dl_vlan_pcp=1,actions=output:16
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=0,actions=output:17
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=0,dl_vlan_pcp=0,actions=output:18
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=0,dl_vlan_pcp=1,actions=output:19
-ovs-ofctl add-flow br0 in_port=0,dl_vlan=0,actions=output:20
-ovs-ofctl add-flow br0 in_port=0,dl_vlan_pcp=0,actions=output:21
-ovs-ofctl add-flow br0 in_port=0,dl_vlan_pcp=1,actions=output:22
-ovs-ofctl add-flow br0 in_port=0,actions=output:23
-ovs-ofctl mod-flows br0 cookie=5,dl_vlan=123,actions=output:3
-ovs-ofctl del-flows br0 dl_vlan=123
-ovs-ofctl del-flows br0
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=124,actions=output:2
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=123,actions=output:5
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=123,dl_vlan_pcp=0,actions=output:6
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=123,dl_vlan_pcp=1,actions=output:7
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=123,actions=output:8
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=65535,dl_vlan_pcp=0,actions=output:9
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=65535,dl_vlan_pcp=1,actions=output:10
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=65535,actions=output:11
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=8191,dl_vlan_pcp=0,actions=output:12
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=8191,dl_vlan_pcp=1,actions=output:13
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=8191,actions=output:14
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=0,dl_vlan_pcp=0,actions=output:15
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=0,dl_vlan_pcp=1,actions=output:16
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=0,actions=output:17
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=0,dl_vlan_pcp=0,actions=output:18
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=0,dl_vlan_pcp=1,actions=output:19
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan=0,actions=output:20
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan_pcp=0,actions=output:21
+ovs-ofctl add-flow test-br0 in_port=0,dl_vlan_pcp=1,actions=output:22
+ovs-ofctl add-flow test-br0 in_port=0,actions=output:23
+ovs-ofctl mod-flows test-br0 cookie=5,dl_vlan=123,actions=output:3
+ovs-ofctl del-flows test-br0 dl_vlan=123
+ovs-ofctl del-flows test-br0
 ovs-appctl -t ovs-ofctl ofctl/barrier
 sort='
     # Sorts groups of lines that start with a space, without moving them
@@ -932,11 +936,11 @@ OFPT_BARRIER_REPLY:
 
 # Check that our own changes are reported as abbreviations.
 ovs-appctl -t ovs-ofctl ofctl/set-output-file monitor.log
-ovs-ofctl add-flow br0 in_port=1,actions=output:2
-ovs-ofctl add-flow br0 in_port=2,actions=output:1
+ovs-ofctl add-flow test-br0 in_port=1,actions=output:2
+ovs-ofctl add-flow test-br0 in_port=2,actions=output:1
 ovs-appctl -t ovs-ofctl ofctl/send 010e004812345678003fffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000ffffffffffff0000
 ovs-appctl -t ovs-ofctl ofctl/barrier
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip], [0], [NXST_FLOW reply:
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip], [0], [NXST_FLOW reply:
 ])
 AT_CHECK([sed 's/ (xid=0x[[1-9a-fA-F]][[0-9a-fA-F]]*)//' monitor.log], [0],
 [NXST_FLOW_MONITOR reply (xid=0x0):
@@ -981,7 +985,7 @@ OVS_VSWITCHD_START
 
 # Start a monitor watching the flow table, then make it block.
 ON_EXIT([kill `cat ovs-ofctl.pid`])
-ovs-ofctl monitor br0 watch: --detach --no-chdir --pidfile >monitor.log 2>&1
+ovs-ofctl monitor test-br0 watch: --detach --no-chdir --pidfile >monitor.log 2>&1
 AT_CAPTURE_FILE([monitor.log])
 ovs-appctl -t ovs-ofctl ofctl/block
 
@@ -992,12 +996,12 @@ perl -e '
         print "cookie=1,reg1=$i,actions=drop\n";
     }
 ') > flows.txt
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
 # Check that multipart flow dumps work properly:
-AT_CHECK([ovs-ofctl diff-flows br0 flows.txt])
-AT_CHECK([ovs-ofctl add-flow br0 in_port=1,cookie=3,actions=drop])
-AT_CHECK([ovs-ofctl mod-flows br0 in_port=2,cookie=2,actions=output:2])
-AT_CHECK([ovs-ofctl del-flows br0 cookie=1/-1])
+AT_CHECK([ovs-ofctl diff-flows test-br0 flows.txt])
+AT_CHECK([ovs-ofctl add-flow test-br0 in_port=1,cookie=3,actions=drop])
+AT_CHECK([ovs-ofctl mod-flows test-br0 in_port=2,cookie=2,actions=output:2])
+AT_CHECK([ovs-ofctl del-flows test-br0 cookie=1/-1])
 
 ovs-appctl -t ovs-ofctl ofctl/unblock
 ovs-appctl -t ovs-ofctl ofctl/barrier
diff --git a/tests/ovs-monitor-ipsec.at b/tests/ovs-monitor-ipsec.at
index e66c943..7a563ec 100644
--- a/tests/ovs-monitor-ipsec.at
+++ b/tests/ovs-monitor-ipsec.at
@@ -59,8 +59,8 @@ OVS_WAIT_UNTIL([test ! -f etc/racoon/certs/ovs-stale.pem])
 ### Add an ipsec_gre psk interface and check what ovs-monitor-ipsec does
 ###
 AT_CHECK([ovs_vsctl \
-              -- add-br br0 \
-              -- add-port br0 gre0 \
+              -- add-br test-br0 \
+              -- add-port test-br0 gre0 \
               -- set interface gre0 type=ipsec_gre \
                                     options:remote_ip=1.2.3.4 \
                                     options:psk=swordfish])
@@ -142,7 +142,7 @@ AT_DATA([key.pem], [dnl
 -----END RSA PRIVATE KEY-----
 ])
 AT_CHECK([ovs_vsctl \
-              -- add-port br0 gre1 \
+              -- add-port test-br0 gre1 \
               -- set Interface gre1 type=ipsec_gre \
                  options:remote_ip=2.3.4.5 \
                  options:peer_cert='"-----BEGIN CERTIFICATE-----
@@ -232,7 +232,7 @@ AT_DATA([ssl-cacert.pem], [dnl
 -----END CERTIFICATE-----
 ])
 AT_CHECK([ovs_vsctl set-ssl /ssl-key.pem /ssl-cert.pem /ssl-cacert.pem \
-              -- add-port br0 gre2 \
+              -- add-port test-br0 gre2 \
               -- set Interface gre2 type=ipsec_gre \
                  options:remote_ip=3.4.5.6 \
                  options:peer_cert='"-----BEGIN CERTIFICATE-----
diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at
index f800da1..bdbf536 100644
--- a/tests/ovs-ofctl.at
+++ b/tests/ovs-ofctl.at
@@ -1806,8 +1806,8 @@ dnl additionally show up as the top 32 bits of the cookie.)  This checks
 dnl for regression against bug #4566.
 AT_SETUP([ovs-ofctl -F option with flow_mods])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl -F nxm add-flow br0 tun_id=0x12345678,actions=drop])
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip], [0], [dnl
+AT_CHECK([ovs-ofctl -F nxm add-flow test-br0 tun_id=0x12345678,actions=drop])
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip], [0], [dnl
 NXST_FLOW reply:
  tun_id=0x12345678 actions=drop
 ])
@@ -1818,8 +1818,8 @@ dnl Check that "-F openflow10" is really honored on dump-flows.
 dnl (If it isn't, then dump-flows will show the register match.)
 AT_SETUP([ovs-ofctl dump-flows honors -F option])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl add-flow br0 reg0=0x12345,actions=drop])
-AT_CHECK([ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip], [0], [dnl
+AT_CHECK([ovs-ofctl add-flow test-br0 reg0=0x12345,actions=drop])
+AT_CHECK([ovs-ofctl -F openflow10 dump-flows test-br0 | ofctl_strip], [0], [dnl
 OFPST_FLOW reply:
  actions=drop
 ])
@@ -1830,7 +1830,7 @@ dnl Check that "-F openflow10" fails on dump-flows if the requested match
 dnl can't be represented in OpenFlow 1.0.
 AT_SETUP([ovs-ofctl dump-flows rejects bad -F option])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl -F openflow10 dump-flows unix:br0.mgmt reg0=0xabcdef], [1], [],
+AT_CHECK([ovs-ofctl -F openflow10 dump-flows unix:test-br0.mgmt reg0=0xabcdef], [1], [],
   [ovs-ofctl: none of the usable flow formats (NXM) is among the allowed flow formats (OpenFlow10)
 ])
 OVS_VSWITCHD_STOP
@@ -1839,7 +1839,7 @@ AT_CLEANUP
 dnl Check that add-flow reports non-normalized flows (feature #5029).
 AT_SETUP([ovs-ofctl add-flow reports non-normalized flows])
 OVS_VSWITCHD_START
-AT_CHECK([ovs-ofctl TESTABLE_LOG add-flow br0 nw_src=1.2.3.4,actions=5],
+AT_CHECK([ovs-ofctl TESTABLE_LOG add-flow test-br0 nw_src=1.2.3.4,actions=5],
   [0], [], [dnl
 ofp_util|INFO|normalization changed ofp_match, details:
 ofp_util|INFO| pre: nw_src=1.2.3.4
@@ -1866,9 +1866,9 @@ priority=8,tcp,tp_src=5 actions=drop
 priority=9,tcp,tp_src=6 actions=drop
 ]])
 
-AT_CHECK([ovs-ofctl add-flows br0 allflows.txt
+AT_CHECK([ovs-ofctl add-flows test-br0 allflows.txt
 ], [0], [ignore])
-AT_CHECK([ovs-ofctl --sort dump-flows br0 | ofctl_strip], [0], [dnl
+AT_CHECK([ovs-ofctl --sort dump-flows test-br0 | ofctl_strip], [0], [dnl
  priority=1,in_port=1026 actions=output:45
  priority=2,in_port=1025 actions=output:47
  priority=3,in_port=1028 actions=output:44
@@ -1879,7 +1879,7 @@ AT_CHECK([ovs-ofctl --sort dump-flows br0 | ofctl_strip], [0], [dnl
  priority=8,tcp,tp_src=5 actions=drop
  priority=9,tcp,tp_src=6 actions=drop
 ])
-AT_CHECK([ovs-ofctl --rsort dump-flows br0 | ofctl_strip], [0], [dnl
+AT_CHECK([ovs-ofctl --rsort dump-flows test-br0 | ofctl_strip], [0], [dnl
  priority=9,tcp,tp_src=6 actions=drop
  priority=8,tcp,tp_src=5 actions=drop
  priority=7,in_port=1029 actions=output:43
@@ -1890,7 +1890,7 @@ AT_CHECK([ovs-ofctl --rsort dump-flows br0 | ofctl_strip], [0], [dnl
  priority=2,in_port=1025 actions=output:47
  priority=1,in_port=1026 actions=output:45
 ])
-AT_CHECK([ovs-ofctl --sort=in_port dump-flows br0 | ofctl_strip], [0], [dnl
+AT_CHECK([ovs-ofctl --sort=in_port dump-flows test-br0 | ofctl_strip], [0], [dnl
  priority=2,in_port=1025 actions=output:47
  priority=1,in_port=1026 actions=output:45
  priority=6,in_port=1027 actions=output:64
@@ -1901,7 +1901,7 @@ AT_CHECK([ovs-ofctl --sort=in_port dump-flows br0 | ofctl_strip], [0], [dnl
  priority=9,tcp,tp_src=6 actions=drop
  priority=8,tcp,tp_src=5 actions=drop
 ])
-AT_CHECK([ovs-ofctl --rsort=in_port dump-flows br0 | ofctl_strip], [0], [dnl
+AT_CHECK([ovs-ofctl --rsort=in_port dump-flows test-br0 | ofctl_strip], [0], [dnl
  priority=4,in_port=23213 actions=output:42
  priority=7,in_port=1029 actions=output:43
  priority=5,in_port=1029 actions=output:43
@@ -1912,7 +1912,7 @@ AT_CHECK([ovs-ofctl --rsort=in_port dump-flows br0 | ofctl_strip], [0], [dnl
  priority=9,tcp,tp_src=6 actions=drop
  priority=8,tcp,tp_src=5 actions=drop
 ])
-AT_CHECK([ovs-ofctl --sort=tcp_src dump-flows br0 | ofctl_strip], [0], [dnl
+AT_CHECK([ovs-ofctl --sort=tcp_src dump-flows test-br0 | ofctl_strip], [0], [dnl
  priority=8,tcp,tp_src=5 actions=drop
  priority=9,tcp,tp_src=6 actions=drop
  priority=7,in_port=1029 actions=output:43
@@ -1924,7 +1924,7 @@ AT_CHECK([ovs-ofctl --sort=tcp_src dump-flows br0 | ofctl_strip], [0], [dnl
  priority=1,in_port=1026 actions=output:45
 ])
 AT_CHECK(
-  [ovs-ofctl --sort=in_port --sort=tcp_src dump-flows br0 | ofctl_strip], [0],
+  [ovs-ofctl --sort=in_port --sort=tcp_src dump-flows test-br0 | ofctl_strip], [0],
   [ priority=2,in_port=1025 actions=output:47
  priority=1,in_port=1026 actions=output:45
  priority=6,in_port=1027 actions=output:64
@@ -1941,23 +1941,23 @@ AT_CLEANUP
 AT_SETUP([ovs-ofctl diff-flows])
 OVS_VSWITCHD_START
 
-# Add tons of flows to br0.
+# Add tons of flows to test-br0.
 for i in `seq 0 1023`; do echo "dl_vlan=$i,actions=drop"; done > add-flows.txt
-AT_CHECK([ovs-ofctl add-flows br0 add-flows.txt])
+AT_CHECK([ovs-ofctl add-flows test-br0 add-flows.txt])
 
 # Dump them and compare against what we expect by hand, then with diff-flows.
 for i in `seq 0 1023`; do echo " dl_vlan=$i actions=drop"; done | sort > expout
-AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sed '/NXST_FLOW/d' | sort],
+AT_CHECK([ovs-ofctl dump-flows test-br0 | ofctl_strip | sed '/NXST_FLOW/d' | sort],
   [0], [expout])
-AT_CHECK([ovs-ofctl diff-flows br0 add-flows.txt])
+AT_CHECK([ovs-ofctl diff-flows test-br0 add-flows.txt])
 
 # Remove even-numbered flows, compare again.
 for i in `seq 0 1023 2`; do echo "dl_vlan=$i"; done > del-flows.txt
-AT_CHECK([ovs-ofctl del-flows br0 - < del-flows.txt])
+AT_CHECK([ovs-ofctl del-flows test-br0 - < del-flows.txt])
 for i in `seq 0 1023 2`; do echo "+dl_vlan=$i actions=drop"; done | sort > expout
-AT_CHECK([ovs-ofctl diff-flows br0 add-flows.txt | sort], [0], [expout])
+AT_CHECK([ovs-ofctl diff-flows test-br0 add-flows.txt | sort], [0], [expout])
 for i in `seq 0 1023 2`; do echo "-dl_vlan=$i actions=drop"; done | sort > expout
-AT_CHECK([ovs-ofctl diff-flows add-flows.txt br0 | sort], [0], [expout])
+AT_CHECK([ovs-ofctl diff-flows add-flows.txt test-br0 | sort], [0], [expout])
 
 OVS_VSWITCHD_STOP
 AT_CLEANUP
@@ -1974,14 +1974,14 @@ AT_SETUP([ovs-ofctl diff-flows - suppress false differences])
 OVS_VSWITCHD_START
 AT_DATA([flows.txt], [actions=resubmit(,1)
 ])
-AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-AT_CHECK([ovs-ofctl diff-flows br0 flows.txt])
-AT_CHECK([ovs-ofctl add-flow br0 idle_timeout=60,dl_vlan=9,actions=output:1])
-AT_CHECK([ovs-ofctl diff-flows br0 flows.txt], [2], [dnl
+AT_CHECK([ovs-ofctl add-flows test-br0 flows.txt])
+AT_CHECK([ovs-ofctl diff-flows test-br0 flows.txt])
+AT_CHECK([ovs-ofctl add-flow test-br0 idle_timeout=60,dl_vlan=9,actions=output:1])
+AT_CHECK([ovs-ofctl diff-flows test-br0 flows.txt], [2], [dnl
 -dl_vlan=9 idle_timeout=60 actions=output:1
 ])
-AT_CHECK([ovs-ofctl add-flow br0 hard_timeout=120,cookie=1234,dl_vlan=9,actions=output:1])
-AT_CHECK([ovs-ofctl diff-flows flows.txt br0], [2], [dnl
+AT_CHECK([ovs-ofctl add-flow test-br0 hard_timeout=120,cookie=1234,dl_vlan=9,actions=output:1])
+AT_CHECK([ovs-ofctl diff-flows flows.txt test-br0], [2], [dnl
 +dl_vlan=9 cookie=0x4d2 hard_timeout=120 actions=output:1
 ])
 OVS_VSWITCHD_STOP
diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at
index e903619..40d6f57 100644
--- a/tests/ovs-vsctl.at
+++ b/tests/ovs-vsctl.at
@@ -378,17 +378,17 @@ AT_SETUP([controllers])
 AT_KEYWORDS([controller ovs-vsctl])
 OVS_VSCTL_SETUP
 AT_CHECK([RUN_OVS_VSCTL_TOGETHER(
-  [add-br br0], 
+  [add-br test-br0], 
 
-  [get-controller br0],
-  [set-controller br0 tcp:4.5.6.7],
-  [get-controller br0],
+  [get-controller test-br0],
+  [set-controller test-br0 tcp:4.5.6.7],
+  [get-controller test-br0],
 
-  [del-controller br0],
-  [get-controller br0],
+  [del-controller test-br0],
+  [get-controller test-br0],
 
-  [set-controller br0 tcp:8.9.10.11 tcp:5.4.3.2],
-  [get-controller br0])], [0], [
+  [set-controller test-br0 tcp:8.9.10.11 tcp:5.4.3.2],
+  [get-controller test-br0])], [0], [
 
 
 tcp:4.5.6.7
@@ -564,11 +564,11 @@ AT_SETUP([database commands -- positive checks])
 AT_KEYWORDS([ovs-vsctl])
 OVS_VSCTL_SETUP
 AT_CHECK(
-  [RUN_OVS_VSCTL_TOGETHER([--id=@br0 create b name=br0],
-                          [set o . bridges=@br0])],
+  [RUN_OVS_VSCTL_TOGETHER([--id=@test-br0 create b name=test-br0],
+                          [set o . bridges=@test-br0])],
   [0], [stdout], [], [OVS_VSCTL_CLEANUP])
 cp stdout out1
-AT_CHECK([RUN_OVS_VSCTL([list b], [get b br0 _uuid])], 
+AT_CHECK([RUN_OVS_VSCTL([list b], [get b test-br0 _uuid])], 
   [0], [stdout], [], [OVS_VSCTL_CLEANUP])
 cp stdout out2
 AT_CHECK([perl $srcdir/uuidfilt.pl out1 out2], [0], 
@@ -583,7 +583,7 @@ fail_mode           : []
 flood_vlans         : []
 flow_tables         : {}
 mirrors             : []
-name                : "br0"
+name                : "test-br0"
 netflow             : []
 other_config        : {}
 ports               : []
@@ -596,55 +596,55 @@ AT_CHECK(
   [RUN_OVS_VSCTL([--columns=fail_mode,name,datapath_type list b])],
   [0],
   [[fail_mode           : []
-name                : "br0"
+name                : "test-br0"
 datapath_type       : ""
 ]], [ignore], [test ! -e pid || kill `cat pid`])
 AT_CHECK(
   [RUN_OVS_VSCTL([--columns=fail_mode,name,datapath_type find b])],
   [0],
   [[fail_mode           : []
-name                : "br0"
+name                : "test-br0"
 datapath_type       : ""
 ]], [ignore], [test ! -e pid || kill `cat pid`])
 AT_CHECK([
-  RUN_OVS_VSCTL_TOGETHER([--id=@br1 create b name=br1 datapath_type="foo"],
-                         [--id=@br2 create b name=br2 external-ids:bar=quux],
-                         [add o . bridges @br1 @br2])],
+  RUN_OVS_VSCTL_TOGETHER([--id=@test-br1 create b name=test-br1 datapath_type="foo"],
+                         [--id=@test-br2 create b name=test-br2 external-ids:bar=quux],
+                         [add o . bridges @test-br1 @test-br2])],
   [0], [stdout], [], [OVS_VSCTL_CLEANUP])
 AT_CHECK(
   [RUN_OVS_VSCTL([--columns=name find b datapath_type!=foo])], [0], [stdout],
   [ignore], [test ! -e pid || kill `cat pid`])
 AT_CHECK([sed -n '/./p' stdout | sort], [0],
-  [[name                : "br0"
-name                : "br2"
+  [[name                : "test-br0"
+name                : "test-br2"
 ]])
 AT_CHECK(
   [RUN_OVS_VSCTL(
-    [set bridge br0 \
+    [set bridge test-br0 \
       'other_config:datapath_id="0123456789ab"' \
       'other_config:hwaddr="00:11:22:33:44:55"' \
       'external-ids={"uuids"="9c45f225-a7cf-439d-976d-83db6271fda1"}' -- \
-     add bridge br0 external_ids '"roles"="local; remote; cloud"'])], 
+     add bridge test-br0 external_ids '"roles"="local; remote; cloud"'])], 
   [0], [], [], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL_ONELINE([get bridge br0 other_config external-ids])], 
+AT_CHECK([RUN_OVS_VSCTL_ONELINE([get bridge test-br0 other_config external-ids])], 
   [0], [{datapath_id="0123456789ab", hwaddr="00:11:22:33:44:55"}\n{roles="local; remote; cloud", uuids="9c45f225-a7cf-439d-976d-83db6271fda1"}
 ], [], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([get bridge br0 other_config:hwaddr -- --if-exists get bridge br0 other-config:nonexistent])], 
+AT_CHECK([RUN_OVS_VSCTL([get bridge test-br0 other_config:hwaddr -- --if-exists get bridge test-br0 other-config:nonexistent])], 
   [0], ["00:11:22:33:44:55"
 
 ], [], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([remove br br0 other_config hwaddr 'datapath_id=""' -- get br br0 other_config])], 
+AT_CHECK([RUN_OVS_VSCTL([remove br test-br0 other_config hwaddr 'datapath_id=""' -- get br test-br0 other_config])], 
   [0], [{datapath_id="0123456789ab"}
 ], [], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([remove br br0 other_config 'datapath_id="0123456789ab"' -- get br br0 other_config])], 
+AT_CHECK([RUN_OVS_VSCTL([remove br test-br0 other_config 'datapath_id="0123456789ab"' -- get br test-br0 other_config])], 
   [0], [{}
 ], [], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([clear br br0 external-ids -- get br br0 external_ids])], 
+AT_CHECK([RUN_OVS_VSCTL([clear br test-br0 external-ids -- get br test-br0 external_ids])], 
   [0], [{}
 ], [], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL_TOGETHER([destroy b br0],
-                                 [destroy b br1],
-                                 [destroy b br2],
+AT_CHECK([RUN_OVS_VSCTL_TOGETHER([destroy b test-br0],
+                                 [destroy b test-br1],
+                                 [destroy b test-br2],
                                  [clear o . bridges])],
   [0], [stdout], [], [OVS_VSCTL_CLEANUP])
 AT_CHECK([RUN_OVS_VSCTL([list b])], 
@@ -655,15 +655,15 @@ AT_CLEANUP
 AT_SETUP([database commands -- negative checks])
 AT_KEYWORDS([ovs-vsctl])
 OVS_VSCTL_SETUP
-AT_CHECK([RUN_OVS_VSCTL([add-br br0])],
+AT_CHECK([RUN_OVS_VSCTL([add-br test-br0])],
   [0], [ignore], [], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([add-br br1])], 
+AT_CHECK([RUN_OVS_VSCTL([add-br test-br1])], 
   [0], [ignore], [], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([set-controller br1 tcp:127.0.0.1])], 
+AT_CHECK([RUN_OVS_VSCTL([set-controller test-br1 tcp:127.0.0.1])], 
   [0], [ignore], [], [OVS_VSCTL_CLEANUP])
 AT_CHECK([
     RUN_OVS_VSCTL_TOGETHER([--id=@n create netflow targets='"1.2.3.4:567"'],
-                           [set bridge br0 netflow=@n])],
+                           [set bridge test-br0 netflow=@n])],
   [0], [stdout], [], [OVS_VSCTL_CLEANUP])
 cp stdout netflow-uuid
 AT_CHECK([RUN_OVS_VSCTL([list netflow `cat netflow-uuid`])],
@@ -685,46 +685,46 @@ AT_CHECK([RUN_OVS_VSCTL([list interx x])],
 AT_CHECK([RUN_OVS_VSCTL([list b x])], 
   [1], [], [ovs-vsctl: no row "x" in table Bridge
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([get b br0 d])], 
+AT_CHECK([RUN_OVS_VSCTL([get b test-br0 d])], 
   [1], [], [ovs-vsctl: Bridge contains more than one column whose name matches "d"
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([get b br0 x])], 
+AT_CHECK([RUN_OVS_VSCTL([get b test-br0 x])], 
   [1], [], [ovs-vsctl: Bridge does not contain a column whose name matches "x"
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([get b br0 :y=z])], 
+AT_CHECK([RUN_OVS_VSCTL([get b test-br0 :y=z])], 
   [1], [], [ovs-vsctl: :y=z: missing column name
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([get b br0 datapath_id:y=z])], 
+AT_CHECK([RUN_OVS_VSCTL([get b test-br0 datapath_id:y=z])], 
   [1], [], [ovs-vsctl: datapath_id:y=z: trailing garbage "=z" in argument
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([set b br0 'datapath_id:y>=z'])], 
+AT_CHECK([RUN_OVS_VSCTL([set b test-br0 'datapath_id:y>=z'])], 
   [1], [], [ovs-vsctl: datapath_id:y>=z: argument does not end in "=" followed by a value.
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([wait-until b br0 datapath_id:y,z])], 
+AT_CHECK([RUN_OVS_VSCTL([wait-until b test-br0 datapath_id:y,z])], 
   [1], [], [ovs-vsctl: datapath_id:y,z: argument does not end in "=", "!=", "<", ">", "<=", ">=", "{=}", "{!=}", "{<}", "{>}", "{<=}", or "{>=}" followed by a value.
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([get b br0 datapath_id::])], 
+AT_CHECK([RUN_OVS_VSCTL([get b test-br0 datapath_id::])], 
   [1], [], [ovs-vsctl: datapath_id::: trailing garbage ":" in argument
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([get b br0 datapath_id:x])], 
+AT_CHECK([RUN_OVS_VSCTL([get b test-br0 datapath_id:x])], 
   [1], [], [ovs-vsctl: cannot specify key to get for non-map column datapath_id
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([get b br0 external_ids:x])], 
-  [1], [], [ovs-vsctl: no key "x" in Bridge record "br0" column external_ids
+AT_CHECK([RUN_OVS_VSCTL([get b test-br0 external_ids:x])], 
+  [1], [], [ovs-vsctl: no key "x" in Bridge record "test-br0" column external_ids
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([set b br0 flood_vlans=-1])], 
+AT_CHECK([RUN_OVS_VSCTL([set b test-br0 flood_vlans=-1])], 
   [1], [], [ovs-vsctl: constraint violation: -1 is not in the valid range 0 to 4095 (inclusive)
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([set b br0 flood_vlans=4096])], 
+AT_CHECK([RUN_OVS_VSCTL([set b test-br0 flood_vlans=4096])], 
   [1], [], [ovs-vsctl: constraint violation: 4096 is not in the valid range 0 to 4095 (inclusive)
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([set c br1 'connection-mode=xyz'])], 
+AT_CHECK([RUN_OVS_VSCTL([set c test-br1 'connection-mode=xyz'])], 
   [1], [], [[ovs-vsctl: constraint violation: xyz is not one of the allowed values ([in-band, out-of-band])
 ]], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([set c br1 connection-mode:x=y])], 
+AT_CHECK([RUN_OVS_VSCTL([set c test-br1 connection-mode:x=y])], 
   [1], [], [ovs-vsctl: cannot specify key to set for non-map column connection_mode
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([add b br1 datapath_id x y])], 
+AT_CHECK([RUN_OVS_VSCTL([add b test-br1 datapath_id x y])], 
   [1], [], [ovs-vsctl: "add" operation would put 2 values in column datapath_id of table Bridge but the maximum number is 1
 ], [OVS_VSCTL_CLEANUP])
 AT_CHECK([RUN_OVS_VSCTL([remove netflow `cat netflow-uuid` targets '"1.2.3.4:567"'])], 
@@ -733,19 +733,19 @@ AT_CHECK([RUN_OVS_VSCTL([remove netflow `cat netflow-uuid` targets '"1.2.3.4:567
 AT_CHECK([RUN_OVS_VSCTL([clear netflow `cat netflow-uuid` targets])], 
   [1], [], [ovs-vsctl: "clear" operation cannot be applied to column targets of table NetFlow, which is not allowed to be empty
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([destroy b br2])], 
-  [1], [], [ovs-vsctl: no row "br2" in table Bridge
+AT_CHECK([RUN_OVS_VSCTL([destroy b test-br2])], 
+  [1], [], [ovs-vsctl: no row "test-br2" in table Bridge
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([add i br1 name x])],
+AT_CHECK([RUN_OVS_VSCTL([add i test-br1 name x])],
   [1], [], [ovs-vsctl: cannot modify read-only column name in table Interface
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([set port br1 name br2])],
+AT_CHECK([RUN_OVS_VSCTL([set port test-br1 name test-br2])],
   [1], [], [ovs-vsctl: cannot modify read-only column name in table Port
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([remove b br1 name br1])],
+AT_CHECK([RUN_OVS_VSCTL([remove b test-br1 name test-br1])],
   [1], [], [ovs-vsctl: cannot modify read-only column name in table Bridge
 ], [OVS_VSCTL_CLEANUP])
-AT_CHECK([RUN_OVS_VSCTL([clear b br1 name])],
+AT_CHECK([RUN_OVS_VSCTL([clear b test-br1 name])],
   [1], [], [ovs-vsctl: cannot modify read-only column name in table Bridge
 ], [OVS_VSCTL_CLEANUP])
 OVS_VSCTL_CLEANUP
@@ -757,14 +757,14 @@ ON_EXIT([kill `cat pid`])
 OVS_VSCTL_SETUP
 AT_CHECK(
   [RUN_OVS_VSCTL_TOGETHER(
-     [add-br br0],
-     [add-br br1], [set bridge br1 flood_vlans=0 other-config:x='""'],
-     [add-br br2], [set bridge br2 flood_vlans=1 other-config:x=y],
-     [add-br br3], [set bridge br3 flood_vlans=0,1 other-config:x=z],
-     [add-br br4], [set bridge br4 flood_vlans=2],
-     [add-br br5], [set bridge br5 flood_vlans=0,2],
-     [add-br br6], [set bridge br6 flood_vlans=1,2],
-     [add-br br7], [set bridge br7 flood_vlans=0,1,2])], [0], [
+     [add-br test-br0],
+     [add-br test-br1], [set bridge test-br1 flood_vlans=0 other-config:x='""'],
+     [add-br test-br2], [set bridge test-br2 flood_vlans=1 other-config:x=y],
+     [add-br test-br3], [set bridge test-br3 flood_vlans=0,1 other-config:x=z],
+     [add-br test-br4], [set bridge test-br4 flood_vlans=2],
+     [add-br test-br5], [set bridge test-br5 flood_vlans=0,2],
+     [add-br test-br6], [set bridge test-br6 flood_vlans=1,2],
+     [add-br test-br7], [set bridge test-br7 flood_vlans=0,1,2])], [0], [
 
 
 
@@ -785,100 +785,100 @@ m4_define([VSCTL_CHECK_FIND],
 ])])
 
 # Arithmetic relational operators without keys.
-VSCTL_CHECK_FIND([flood_vlans=0], [br1])
-VSCTL_CHECK_FIND([flood_vlans=1], [br2])
-VSCTL_CHECK_FIND([flood_vlans=0,2], [br5])
-VSCTL_CHECK_FIND([flood_vlans=0,1,2], [br7])
+VSCTL_CHECK_FIND([flood_vlans=0], [test-br1])
+VSCTL_CHECK_FIND([flood_vlans=1], [test-br2])
+VSCTL_CHECK_FIND([flood_vlans=0,2], [test-br5])
+VSCTL_CHECK_FIND([flood_vlans=0,1,2], [test-br7])
 VSCTL_CHECK_FIND([flood_vlans=3], [])
 
-VSCTL_CHECK_FIND([flood_vlans!=0], [br0 br2 br3 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([flood_vlans!=1], [br0 br1 br3 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([flood_vlans!=0,2], [br0 br1 br2 br3 br4 br6 br7])
-VSCTL_CHECK_FIND([flood_vlans!=0,1,2], [br0 br1 br2 br3 br4 br5 br6])
-VSCTL_CHECK_FIND([flood_vlans!=3], [br0 br1 br2 br3 br4 br5 br6 br7])
-
-VSCTL_CHECK_FIND([flood_vlans<2], [br0 br1 br2])
-VSCTL_CHECK_FIND([flood_vlans<0,2], [br0 br1 br2 br3 br4])
-VSCTL_CHECK_FIND([flood_vlans>1], [br3 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([flood_vlans>0,1], [br5 br6 br7])
-VSCTL_CHECK_FIND([flood_vlans<=2], [br0 br1 br2 br4])
-VSCTL_CHECK_FIND([flood_vlans<=0,2], [br0 br1 br2 br3 br4 br5])
-VSCTL_CHECK_FIND([flood_vlans>=1], [br2 br3 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([flood_vlans>=0,1], [br3 br5 br6 br7])
+VSCTL_CHECK_FIND([flood_vlans!=0], [test-br0 test-br2 test-br3 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([flood_vlans!=1], [test-br0 test-br1 test-br3 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([flood_vlans!=0,2], [test-br0 test-br1 test-br2 test-br3 test-br4 test-br6 test-br7])
+VSCTL_CHECK_FIND([flood_vlans!=0,1,2], [test-br0 test-br1 test-br2 test-br3 test-br4 test-br5 test-br6])
+VSCTL_CHECK_FIND([flood_vlans!=3], [test-br0 test-br1 test-br2 test-br3 test-br4 test-br5 test-br6 test-br7])
+
+VSCTL_CHECK_FIND([flood_vlans<2], [test-br0 test-br1 test-br2])
+VSCTL_CHECK_FIND([flood_vlans<0,2], [test-br0 test-br1 test-br2 test-br3 test-br4])
+VSCTL_CHECK_FIND([flood_vlans>1], [test-br3 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([flood_vlans>0,1], [test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([flood_vlans<=2], [test-br0 test-br1 test-br2 test-br4])
+VSCTL_CHECK_FIND([flood_vlans<=0,2], [test-br0 test-br1 test-br2 test-br3 test-br4 test-br5])
+VSCTL_CHECK_FIND([flood_vlans>=1], [test-br2 test-br3 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([flood_vlans>=0,1], [test-br3 test-br5 test-br6 test-br7])
 
 # Set relational operators without keys.
-VSCTL_CHECK_FIND([flood_vlans{=}0], [br1])
-VSCTL_CHECK_FIND([flood_vlans{=}1], [br2])
-VSCTL_CHECK_FIND([flood_vlans{=}0,2], [br5])
-VSCTL_CHECK_FIND([flood_vlans{=}0,1,2], [br7])
+VSCTL_CHECK_FIND([flood_vlans{=}0], [test-br1])
+VSCTL_CHECK_FIND([flood_vlans{=}1], [test-br2])
+VSCTL_CHECK_FIND([flood_vlans{=}0,2], [test-br5])
+VSCTL_CHECK_FIND([flood_vlans{=}0,1,2], [test-br7])
 VSCTL_CHECK_FIND([flood_vlans{=}3], [])
 
-VSCTL_CHECK_FIND([flood_vlans{!=}0], [br0 br2 br3 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([flood_vlans{!=}1], [br0 br1 br3 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([flood_vlans{!=}0,2], [br0 br1 br2 br3 br4 br6 br7])
-VSCTL_CHECK_FIND([flood_vlans{!=}0,1,2], [br0 br1 br2 br3 br4 br5 br6])
-VSCTL_CHECK_FIND([flood_vlans{!=}3], [br0 br1 br2 br3 br4 br5 br6 br7])
+VSCTL_CHECK_FIND([flood_vlans{!=}0], [test-br0 test-br2 test-br3 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([flood_vlans{!=}1], [test-br0 test-br1 test-br3 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([flood_vlans{!=}0,2], [test-br0 test-br1 test-br2 test-br3 test-br4 test-br6 test-br7])
+VSCTL_CHECK_FIND([flood_vlans{!=}0,1,2], [test-br0 test-br1 test-br2 test-br3 test-br4 test-br5 test-br6])
+VSCTL_CHECK_FIND([flood_vlans{!=}3], [test-br0 test-br1 test-br2 test-br3 test-br4 test-br5 test-br6 test-br7])
 
 VSCTL_CHECK_FIND([flood_vlans{<}[[]]], [])
-VSCTL_CHECK_FIND([flood_vlans{<=}[[]]], [br0])
-VSCTL_CHECK_FIND([flood_vlans{<}0], [br0])
-VSCTL_CHECK_FIND([flood_vlans{<=}0], [br0 br1])
-VSCTL_CHECK_FIND([flood_vlans{<}1,2], [br0 br2 br4])
-VSCTL_CHECK_FIND([flood_vlans{<=}1,2], [br0 br2 br4 br6])
-
-VSCTL_CHECK_FIND([flood_vlans{>}[[]]], [br1 br2 br3 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([flood_vlans{>=}[[]]], [br0 br1 br2 br3 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([flood_vlans{>}0], [br3 br5 br7])
-VSCTL_CHECK_FIND([flood_vlans{>=}0], [br1 br3 br5 br7])
-VSCTL_CHECK_FIND([flood_vlans{>}0,2], [br7])
-VSCTL_CHECK_FIND([flood_vlans{>=}1,2], [br6 br7])
-VSCTL_CHECK_FIND([flood_vlans{>=}0,2], [br5 br7])
+VSCTL_CHECK_FIND([flood_vlans{<=}[[]]], [test-br0])
+VSCTL_CHECK_FIND([flood_vlans{<}0], [test-br0])
+VSCTL_CHECK_FIND([flood_vlans{<=}0], [test-br0 test-br1])
+VSCTL_CHECK_FIND([flood_vlans{<}1,2], [test-br0 test-br2 test-br4])
+VSCTL_CHECK_FIND([flood_vlans{<=}1,2], [test-br0 test-br2 test-br4 test-br6])
+
+VSCTL_CHECK_FIND([flood_vlans{>}[[]]], [test-br1 test-br2 test-br3 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([flood_vlans{>=}[[]]], [test-br0 test-br1 test-br2 test-br3 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([flood_vlans{>}0], [test-br3 test-br5 test-br7])
+VSCTL_CHECK_FIND([flood_vlans{>=}0], [test-br1 test-br3 test-br5 test-br7])
+VSCTL_CHECK_FIND([flood_vlans{>}0,2], [test-br7])
+VSCTL_CHECK_FIND([flood_vlans{>=}1,2], [test-br6 test-br7])
+VSCTL_CHECK_FIND([flood_vlans{>=}0,2], [test-br5 test-br7])
 
 # Arithmetic relational operators with keys.
-VSCTL_CHECK_FIND([other-config:x=""], [br1])
-VSCTL_CHECK_FIND([other-config:x=y], [br2])
-VSCTL_CHECK_FIND([other-config:x=z], [br3])
+VSCTL_CHECK_FIND([other-config:x=""], [test-br1])
+VSCTL_CHECK_FIND([other-config:x=y], [test-br2])
+VSCTL_CHECK_FIND([other-config:x=z], [test-br3])
 
-VSCTL_CHECK_FIND([other-config:x!=""], [br2 br3])
-VSCTL_CHECK_FIND([other-config:x!=y], [br1 br3])
-VSCTL_CHECK_FIND([other-config:x!=z], [br1 br2])
+VSCTL_CHECK_FIND([other-config:x!=""], [test-br2 test-br3])
+VSCTL_CHECK_FIND([other-config:x!=y], [test-br1 test-br3])
+VSCTL_CHECK_FIND([other-config:x!=z], [test-br1 test-br2])
 
-VSCTL_CHECK_FIND([other-config:x>y], [br3])
-VSCTL_CHECK_FIND([other-config:x>=y], [br2 br3])
-VSCTL_CHECK_FIND([other-config:x<y], [br1])
-VSCTL_CHECK_FIND([other-config:x<=y], [br1 br2])
+VSCTL_CHECK_FIND([other-config:x>y], [test-br3])
+VSCTL_CHECK_FIND([other-config:x>=y], [test-br2 test-br3])
+VSCTL_CHECK_FIND([other-config:x<y], [test-br1])
+VSCTL_CHECK_FIND([other-config:x<=y], [test-br1 test-br2])
 
 # Set relational operators with keys.
-VSCTL_CHECK_FIND([other-config:x{=}[[]]], [br0 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([other-config:x{=}""], [br1])
-VSCTL_CHECK_FIND([other-config:x{=}y], [br2])
-VSCTL_CHECK_FIND([other-config:x{=}z], [br3])
-
-VSCTL_CHECK_FIND([other-config:x{!=}[[]]], [br1 br2 br3])
-VSCTL_CHECK_FIND([other-config:x{!=}""], [br0 br2 br3 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([other-config:x{!=}y], [br0 br1 br3 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([other-config:x{!=}z], [br0 br1 br2 br4 br5 br6 br7])
-
-VSCTL_CHECK_FIND([other-config:x{<=}[[]]], [br0 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([other-config:x{<=}x], [br0 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([other-config:x{<=}""], [br0 br1 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([other-config:x{<=}y], [br0 br2 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([other-config:x{<=}z], [br0 br3 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([other-config:x{<=}x,y,z], [br0 br2 br3 br4 br5 br6 br7])
+VSCTL_CHECK_FIND([other-config:x{=}[[]]], [test-br0 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([other-config:x{=}""], [test-br1])
+VSCTL_CHECK_FIND([other-config:x{=}y], [test-br2])
+VSCTL_CHECK_FIND([other-config:x{=}z], [test-br3])
+
+VSCTL_CHECK_FIND([other-config:x{!=}[[]]], [test-br1 test-br2 test-br3])
+VSCTL_CHECK_FIND([other-config:x{!=}""], [test-br0 test-br2 test-br3 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([other-config:x{!=}y], [test-br0 test-br1 test-br3 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([other-config:x{!=}z], [test-br0 test-br1 test-br2 test-br4 test-br5 test-br6 test-br7])
+
+VSCTL_CHECK_FIND([other-config:x{<=}[[]]], [test-br0 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([other-config:x{<=}x], [test-br0 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([other-config:x{<=}""], [test-br0 test-br1 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([other-config:x{<=}y], [test-br0 test-br2 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([other-config:x{<=}z], [test-br0 test-br3 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([other-config:x{<=}x,y,z], [test-br0 test-br2 test-br3 test-br4 test-br5 test-br6 test-br7])
 
 VSCTL_CHECK_FIND([other-config:x{<}[[]]], [])
-VSCTL_CHECK_FIND([other-config:x{<}x], [br0 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([other-config:x{<}""], [br0 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([other-config:x{<}y], [br0 br4 br5 br6 br7])
-VSCTL_CHECK_FIND([other-config:x{<}z], [br0 br4 br5 br6 br7])
+VSCTL_CHECK_FIND([other-config:x{<}x], [test-br0 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([other-config:x{<}""], [test-br0 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([other-config:x{<}y], [test-br0 test-br4 test-br5 test-br6 test-br7])
+VSCTL_CHECK_FIND([other-config:x{<}z], [test-br0 test-br4 test-br5 test-br6 test-br7])
 
-VSCTL_CHECK_FIND([other-config:x{>=}[[]]], [br0 br1 br2 br3 br4 br5 br6 br7])
+VSCTL_CHECK_FIND([other-config:x{>=}[[]]], [test-br0 test-br1 test-br2 test-br3 test-br4 test-br5 test-br6 test-br7])
 VSCTL_CHECK_FIND([other-config:x{>=}x], [])
-VSCTL_CHECK_FIND([other-config:x{>=}""], [br1])
-VSCTL_CHECK_FIND([other-config:x{>=}y], [br2])
-VSCTL_CHECK_FIND([other-config:x{>=}z], [br3])
+VSCTL_CHECK_FIND([other-config:x{>=}""], [test-br1])
+VSCTL_CHECK_FIND([other-config:x{>=}y], [test-br2])
+VSCTL_CHECK_FIND([other-config:x{>=}z], [test-br3])
 
-VSCTL_CHECK_FIND([other-config:x{>}[[]]], [br1 br2 br3])
+VSCTL_CHECK_FIND([other-config:x{>}[[]]], [test-br1 test-br2 test-br3])
 VSCTL_CHECK_FIND([other-config:x{>}x], [])
 VSCTL_CHECK_FIND([other-config:x{>}""], [])
 VSCTL_CHECK_FIND([other-config:x{>}y], [])
@@ -890,8 +890,8 @@ AT_SETUP([database commands -- wait-until immediately true])
 AT_KEYWORDS([ovs-vsctl])
 OVS_VSCTL_SETUP
 AT_CHECK([RUN_OVS_VSCTL(
-    [add-br br0], 
-    [add-bond br0 bond0 eth0 eth1],
+    [add-br test-br0], 
+    [add-bond test-br0 bond0 eth0 eth1],
     [set port bond0 bond_updelay=500 other-config:abc=def])],
   [0], [], [], [OVS_VSCTL_CLEANUP])
 AT_CHECK([RUN_OVS_VSCTL([[wait-until Open_vSwitch . manager_options=[]]])],
@@ -911,16 +911,16 @@ AT_KEYWORDS([ovs-vsctl])
 OVS_VSCTL_SETUP
 
 # Start ovs-vsctls in background.
-(RUN_OVS_VSCTL([[wait-until o . bridges!=[] -- get bridge br10 other-config:abc]])) > stdout1 &
-(RUN_OVS_VSCTL([[wait-until bridge br1 -- get bridge br1 other-config:abc]])) > stdout2 &
-(RUN_OVS_VSCTL([[wait-until b br1 other-config={abc=def} -- get bridge br1 other-config]])) > stdout3 &
+(RUN_OVS_VSCTL([[wait-until o . bridges!=[] -- get bridge test-br10 other-config:abc]])) > stdout1 &
+(RUN_OVS_VSCTL([[wait-until bridge test-br1 -- get bridge test-br1 other-config:abc]])) > stdout2 &
+(RUN_OVS_VSCTL([[wait-until b test-br1 other-config={abc=def} -- get bridge test-br1 other-config]])) > stdout3 &
 (RUN_OVS_VSCTL([[wait-until port bond0 'bond_updelay>50' -- get port bond0 bond-updelay]])) > stdout4 &
 
 # Give the ovs-vsctls a chance to read the database
 sleep 1
 
-AT_CHECK([RUN_OVS_VSCTL([add-br br10 -- set bridge br10 other-config:abc=quux])
-RUN_OVS_VSCTL([add-br br1 -- set bridge br1 other-config:abc=def -- add-bond br1 bond0 eth0 eth1 -- set port bond0 bond_updelay=500])],
+AT_CHECK([RUN_OVS_VSCTL([add-br test-br10 -- set bridge test-br10 other-config:abc=quux])
+RUN_OVS_VSCTL([add-br test-br1 -- set bridge test-br1 other-config:abc=def -- add-bond test-br1 bond0 eth0 eth1 -- set port bond0 bond_updelay=500])],
   [0], [], [], [OVS_VSCTL_CLEANUP])
 
 # Wait for the ovs-vsctls to finish.
@@ -942,12 +942,12 @@ AT_CLEANUP
 AT_SETUP([--id option on create, get commands])
 AT_KEYWORDS([ovs-vsctl])
 OVS_VSCTL_SETUP
-AT_CHECK([RUN_OVS_VSCTL([add-br br0],
-                        [add-port br0 eth0],
-                        [add-port br0 eth1])])
+AT_CHECK([RUN_OVS_VSCTL([add-br test-br0],
+                        [add-port test-br0 eth0],
+                        [add-port test-br0 eth1])])
 AT_CHECK(
   [RUN_OVS_VSCTL_TOGETHER(
-    [set bridge br0 mirrors=@m],
+    [set bridge test-br0 mirrors=@m],
     [--id=@eth0 get port eth0],
     [--id=@eth1 get port eth1],
     [--id=@m create mirror name=mymirror select-dst-port=@eth0 select-src-port=@eth0 output-port=@eth1])],
@@ -964,7 +964,7 @@ AT_CHECK(
   [RUN_OVS_VSCTL(
     [list port eth0 eth1],
     [list mirror],
-    [list bridge br0])],
+    [list bridge test-br0])],
   [0], [stdout], [], [OVS_VSCTL_CLEANUP])
 AT_CHECK(
   [sed -n -e '/uuid/p' -e '/name/p' -e '/mirrors/p' -e '/select/p' -e '/output/p' < stdout | $srcdir/uuidfilt.pl], [0], [dnl
@@ -982,7 +982,7 @@ select_src_port     : [<0>]
 select_vlan         : []
 _uuid               : <3>
 mirrors             : [<2>]
-name                : "br0"
+name                : "test-br0"
 ]],
   [], [OVS_VSCTL_CLEANUP])
 OVS_VSCTL_CLEANUP
@@ -993,23 +993,23 @@ AT_KEYWORDS([ovs-vsctl])
 OVS_VSCTL_SETUP
 AT_CHECK(
   [ovs-vsctl -vPATTERN:console:'%c|%p|%m' --timeout=5 --no-wait -vreconnect:emer --db=unix:socket \
-     -- create Bridge name=br0 | $srcdir/uuidfilt.pl],
+     -- create Bridge name=test-br0 | $srcdir/uuidfilt.pl],
   [0], [<0>
 ], [vsctl|WARN|applying "create" command to table Bridge without --id option will have no effect
 ], [OVS_VSCTL_CLEANUP])
 AT_CHECK(
   [ovs-vsctl -vPATTERN:console:'%c|%p|%m' --timeout=5 --no-wait -vreconnect:emer --db=unix:socket \
-     -- --id=@br0 create Bridge name=br0 | $srcdir/uuidfilt.pl],
+     -- --id=@test-br0 create Bridge name=test-br0 | $srcdir/uuidfilt.pl],
   [0], [<0>
-], [vsctl|WARN|row id "@br0" was created but no reference to it was inserted, so it will not actually appear in the database
+], [vsctl|WARN|row id "@test-br0" was created but no reference to it was inserted, so it will not actually appear in the database
 ], [OVS_VSCTL_CLEANUP])
 AT_CHECK(
   [ovs-vsctl -vPATTERN:console:'%c|%p|%m' --timeout=5 --no-wait -vreconnect:emer --db=unix:socket \
      -- --id=@eth0_iface create Interface name=eth0 \
      -- --id=@eth0 create Port name=eth0 interfaces=@eth0_iface \
      -- --id=@m0 create Mirror name=m0 output_port=@eth0 \
-     -- --id=@br0 create Bridge name=br0 mirrors=@m0 \
-     -- set Open_vSwitch . bridges=@br0 | $srcdir/uuidfilt.pl],
+     -- --id=@test-br0 create Bridge name=test-br0 mirrors=@m0 \
+     -- set Open_vSwitch . bridges=@test-br0 | $srcdir/uuidfilt.pl],
   [0], [<0>
 <1>
 <2>
@@ -1025,7 +1025,7 @@ dnl The bug is documented in ovs-vsctl.8.
 AT_SETUP([created row UUID is wrong in same execution])
 AT_KEYWORDS([ovs-vsctl])
 OVS_VSCTL_SETUP
-AT_CHECK([RUN_OVS_VSCTL([--id=@br0 create Bridge name=br0 -- add Open_vSwitch . bridges @br0 -- list b])],
+AT_CHECK([RUN_OVS_VSCTL([--id=@test-br0 create Bridge name=test-br0 -- add Open_vSwitch . bridges @test-br0 -- list b])],
   [0], [stdout], [], [OVS_VSCTL_CLEANUP])
 AT_CHECK([perl $srcdir/uuidfilt.pl stdout], [0], 
   [[<0>
@@ -1038,7 +1038,7 @@ fail_mode           : []
 flood_vlans         : []
 flow_tables         : {}
 mirrors             : []
-name                : "br0"
+name                : "test-br0"
 netflow             : []
 other_config        : {}
 ports               : []
diff --git a/tests/ovsdb-row.at b/tests/ovsdb-row.at
index 34a102c..a6ea933 100644
--- a/tests/ovsdb-row.at
+++ b/tests/ovsdb-row.at
@@ -103,11 +103,11 @@ OVSDB_CHECK_POSITIVE([row with several columns],
          "listeners": {"type": {"key": "uuid", "min": 0, "max": "unlimited"}},
          "snoops": {"type": {"key": "uuid", "min": 0, "max": "unlimited"}}}}' \
     '{"vswitch": ["uuid", "1a5c7280-0d4c-4e34-9ec7-c772339f7774"],
-      "name": "br0",
+      "name": "test-br0",
       "datapath_id": "000ae4256bb0",
       "hwaddr": "00:0a:e4:25:6b:b0"}' \
     '{}']],
- [{RESERVED_COLUMNS,["controller":["set",[]],"datapath_id":"000ae4256bb0","hwaddr":"00:0a:e4:25:6b:b0","listeners":["set",[]],"mirrors":["set",[]],"name":"br0","netflows":["set",[]],"snoops":["set",[]],"vswitch":["uuid","1a5c7280-0d4c-4e34-9ec7-c772339f7774"]]}
+ [{RESERVED_COLUMNS,["controller":["set",[]],"datapath_id":"000ae4256bb0","hwaddr":"00:0a:e4:25:6b:b0","listeners":["set",[]],"mirrors":["set",[]],"name":"test-br0","netflows":["set",[]],"snoops":["set",[]],"vswitch":["uuid","1a5c7280-0d4c-4e34-9ec7-c772339f7774"]]}
 datapath_id, hwaddr, name, vswitch
 {RESERVED_COLUMNS,["controller":["set",[]],"datapath_id":["set",[]],"hwaddr":"","listeners":["set",[]],"mirrors":["set",[]],"name":"","netflows":["set",[]],"snoops":["set",[]],"vswitch":["uuid","00000000-0000-0000-0000-000000000000"]]}
 <none>], [])
-- 
1.7.5.4




More information about the dev mailing list