From: Jakub Libosvar <libosvar@redhat.com>
Date: Wed, 22 Apr 2015 14:47:33 +0000 (+0200)
Subject: Create bridges in ovsdb monitor functional tests
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6bece0f61d60006280df49df5bee74557554bd35;p=openstack-build%2Fneutron-build.git

Create bridges in ovsdb monitor functional tests

The test waits inside for output from 'ovsdb-client monitor Bridge'
command but the command makes output only if there is a bridge present
in ovsdb. This patch adds an OVSBridgeFixture to setup so every test
case has a bridge for sure.

Change-Id: I40e1c99ec956c92fa1c7763eb98f7f2ce6fcd226
Closes-Bug: 1447191
(cherry picked from commit aa57c364defec8519bbed06fbce5aae4b23f147f)
---

diff --git a/neutron/tests/functional/agent/linux/test_ovsdb_monitor.py b/neutron/tests/functional/agent/linux/test_ovsdb_monitor.py
index d1de2068f..450a26192 100644
--- a/neutron/tests/functional/agent/linux/test_ovsdb_monitor.py
+++ b/neutron/tests/functional/agent/linux/test_ovsdb_monitor.py
@@ -48,6 +48,8 @@ class BaseMonitorTest(linux_base.BaseOVSLinuxTestCase):
                         root_helper=" ".join([functional_base.SUDO_CMD] * 2))
 
         self._check_test_requirements()
+        # ovsdb-client monitor needs to have a bridge to make any output
+        self.useFixture(net_helpers.OVSBridgeFixture())
 
     def _check_test_requirements(self):
         self.check_command(['ovsdb-client', 'list-dbs'],