openstack
/
neutron
Code Issues Proposed changes

Fix broken unit tests related to ovsdbapp indexing 

The periodic job running ovsdbapp master started failing after the
ovsdbapp custom indexing patch merged. There were just some things
that needed to be mocked out.

Closes-Bug: #1879717
Change-Id: I37d4c655662dd9d55b6096f2dc4fc861894706d2
This commit is contained in:
Terry Wilson 2020-05-20 14:50:10 +00:00
parent ba05201e0e
commit 162c5572df
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/tests/unit/fake_resources.py
View File

@ -385,15 +385,17 @@ class FakeOvsdbTable(FakeResource):
# Set default attributes.
ovsdb_table_attrs = {
'rows': {},
'rows': collections.UserDict(),
'columns': {},
}
# Overwrite default attributes.
ovsdb_table_attrs.update(attrs)
return FakeResource(info=copy.deepcopy(ovsdb_table_attrs),
loaded=True)
result = FakeResource(info=copy.deepcopy(ovsdb_table_attrs),
loaded=True)
result.rows.indexes = {}
return result
class FakePort(object):

22
neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_impl_idl_ovn.py
View File

@ -16,6 +16,8 @@ import copy
from unittest import mock
import uuid
from ovsdbapp.backend import ovs_idl
from neutron.common.ovn import constants as ovn_const
from neutron.common.ovn import utils
from neutron.conf.plugins.ml2.drivers.ovn import ovn_conf
@ -339,8 +341,10 @@ class TestNBImplIdlOvn(TestDBImplIdlOvn):
with mock.patch.object(impl_idl_ovn, 'get_connection',
return_value=mock.Mock()):
impl_idl_ovn.OvsdbNbOvnIdl.ovsdb_connection = None
self.nb_ovn_idl = impl_idl_ovn.OvsdbNbOvnIdl(mock.Mock())
with mock.patch.object(ovs_idl.Backend, 'autocreate_indices',
create=True):
impl_idl_ovn.OvsdbNbOvnIdl.ovsdb_connection = None
self.nb_ovn_idl = impl_idl_ovn.OvsdbNbOvnIdl(mock.Mock())
self.nb_ovn_idl.idl.tables = self._tables
@ -396,6 +400,8 @@ class TestNBImplIdlOvn(TestDBImplIdlOvn):
fake_address_sets = TestNBImplIdlOvn.fake_set['address_sets']
self._load_ovsdb_fake_rows(self.address_set_table, fake_address_sets)
@mock.patch.object(ovs_idl.Backend, 'autocreate_indices', mock.Mock(),
create=True)
@mock.patch.object(impl_idl_ovn.OvsdbNbOvnIdl, 'ovsdb_connection', None)
@mock.patch.object(impl_idl_ovn, 'get_connection', mock.Mock())
def test_setting_ovsdb_probe_timeout_default_value(self):
@ -403,6 +409,8 @@ class TestNBImplIdlOvn(TestDBImplIdlOvn):
inst.idl._session.reconnect.set_probe_interval.assert_called_with(
60000)
@mock.patch.object(ovs_idl.Backend, 'autocreate_indices', mock.Mock(),
create=True)
@mock.patch.object(impl_idl_ovn.OvsdbNbOvnIdl, 'ovsdb_connection', None)
@mock.patch.object(impl_idl_ovn, 'get_connection', mock.Mock())
@mock.patch.object(ovn_conf, 'get_ovn_ovsdb_probe_interval')
@ -799,8 +807,10 @@ class TestSBImplIdlOvn(TestDBImplIdlOvn):
with mock.patch.object(impl_idl_ovn, 'get_connection',
return_value=mock.Mock()):
impl_idl_ovn.OvsdbSbOvnIdl.ovsdb_connection = None
self.sb_ovn_idl = impl_idl_ovn.OvsdbSbOvnIdl(mock.Mock())
with mock.patch.object(ovs_idl.Backend, 'autocreate_indices',
create=True):
impl_idl_ovn.OvsdbSbOvnIdl.ovsdb_connection = None
self.sb_ovn_idl = impl_idl_ovn.OvsdbSbOvnIdl(mock.Mock())
self.sb_ovn_idl.idl.tables = self._tables
@ -809,6 +819,8 @@ class TestSBImplIdlOvn(TestDBImplIdlOvn):
fake_chassis = TestSBImplIdlOvn.fake_set['chassis']
self._load_ovsdb_fake_rows(self.chassis_table, fake_chassis)
@mock.patch.object(ovs_idl.Backend, 'autocreate_indices', mock.Mock(),
create=True)
@mock.patch.object(impl_idl_ovn.OvsdbSbOvnIdl, 'ovsdb_connection', None)
@mock.patch.object(impl_idl_ovn, 'get_connection', mock.Mock())
def test_setting_ovsdb_probe_timeout_default_value(self):
@ -816,6 +828,8 @@ class TestSBImplIdlOvn(TestDBImplIdlOvn):
inst.idl._session.reconnect.set_probe_interval.assert_called_with(
60000)
@mock.patch.object(ovs_idl.Backend, 'autocreate_indices', mock.Mock(),
create=True)
@mock.patch.object(impl_idl_ovn.OvsdbSbOvnIdl, 'ovsdb_connection', None)
@mock.patch.object(impl_idl_ovn, 'get_connection', mock.Mock())
@mock.patch.object(ovn_conf, 'get_ovn_ovsdb_probe_interval')