From 6754e92d784355ce3568ebf7394a146dd5f73a2f Mon Sep 17 00:00:00 2001 From: Flavio Fernandes Date: Mon, 16 May 2016 21:02:51 -0400 Subject: [PATCH] ovn test: remove check for non-existing bridge in hv3 In OVN vtep test, the network topology is like this: hv1---\ >-- [net1] <-- vtep --> [net2] <-- hv3 hv2---/ The logical switch lsw0 created in this test has no logical port corresponding to hv3, so that hypervisor does not have any bridges created by OVN. With this test change, we are replacing the 'show br-int' with a check to ensure that 'br-int' is not present. Fixes: 8dab102238f0 ("ovn: Add more details to test output.") Signed-off-by: Flavio Fernandes Signed-off-by: Ben Pfaff --- tests/ovn.at | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index 75f7441341c..1127cea0202 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -1186,8 +1186,10 @@ as hv2 ovs-ofctl -O OpenFlow13 dump-flows br-int echo "------ hv3 dump ------" as hv3 ovs-vsctl show -as hv3 ovs-ofctl show br-int -as hv3 ovs-ofctl -O OpenFlow13 dump-flows br-int +# note: hv3 has no logical port bind, thus it should not have br-int +AT_CHECK([as hv3 ovs-ofctl -O OpenFlow13 show br-int], [1], [], +[ovs-ofctl: br-int is not a bridge or a socket +]) # Now check the packets actually received against the ones expected. for i in 1 2 3; do