Merge "fullstack: Actually run ovsfw tests"

This commit is contained in:
Jenkins 2017-08-15 03:57:17 +00:00 committed by Gerrit Code Review
commit bc782c8248
1 changed files with 5 additions and 4 deletions

View File

@ -43,10 +43,6 @@ class BaseSecurityGroupsSameNetworkTest(base.BaseFullStackTestCase):
ovsdb_interface = None
def setUp(self):
if (self.firewall_driver == 'openvswitch' and
not OVSVersionChecker.supports_ovsfirewall()):
self.skipTest("Open vSwitch firewall_driver doesn't work "
"with this version of ovs.")
host_descriptions = [
environment.HostDescription(
of_interface=self.of_interface,
@ -60,6 +56,11 @@ class BaseSecurityGroupsSameNetworkTest(base.BaseFullStackTestCase):
host_descriptions)
super(BaseSecurityGroupsSameNetworkTest, self).setUp(env)
if (self.firewall_driver == 'openvswitch' and
not OVSVersionChecker.supports_ovsfirewall()):
self.skipTest("Open vSwitch firewall_driver doesn't work "
"with this version of ovs.")
def assert_connection(self, *args, **kwargs):
netcat = net_helpers.NetcatTester(*args, **kwargs)
try: