Skip to content

Commit a8bf8cd

Browse files
committed
Fix TestOVNMechanismDriver ipv6 tests
- test_update_subnet_dhcp_options_in_ovn_ipv6_not_change - test_enable_subnet_dhcp_options_in_ovn_ipv6 This tests will fail if host where unit tests has ipv6 dns_servers configured. This patch mocks get_system_dns_servers to avoid tests to look at the host configuration. Closes-Bug: #2056778 Change-Id: I2e703ab4b63c90d7a14f0dc41d37b0a98163bce0 (cherry picked from commit 2a196fe)
1 parent 5ffec5d commit a8bf8cd

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,9 +1531,10 @@ def test_enable_subnet_dhcp_options_in_ovn_ipv4(self, grm, gps):
15311531
self.mech_driver.nb_ovn.set_lswitch_port.assert_has_calls(
15321532
set_lsp_calls, any_order=True)
15331533

1534+
@mock.patch.object(ovn_utils, 'get_system_dns_resolvers')
15341535
@mock.patch.object(db_base_plugin_v2.NeutronDbPluginV2, 'get_ports')
15351536
@mock.patch.object(n_net, 'get_random_mac')
1536-
def test_enable_subnet_dhcp_options_in_ovn_ipv6(self, grm, gps):
1537+
def test_enable_subnet_dhcp_options_in_ovn_ipv6(self, grm, gps, gsd):
15371538
grm.return_value = '01:02:03:04:05:06'
15381539
gps.return_value = [
15391540
{'id': 'port-id-1', 'device_owner': 'nova:compute'},
@@ -1546,6 +1547,7 @@ def test_enable_subnet_dhcp_options_in_ovn_ipv6(self, grm, gps):
15461547
{'opt_value': '10::34', 'ip_version': 6,
15471548
'opt_name': 'dns-server'}]},
15481549
{'id': 'port-id-10', 'device_owner': 'network:foo'}]
1550+
gsd.return_value = []
15491551
subnet = {'id': 'subnet-id', 'ip_version': 6, 'cidr': '10::0/64',
15501552
'gateway_ip': '10::1', 'enable_dhcp': True,
15511553
'ipv6_address_mode': 'dhcpv6-stateless',
@@ -1712,7 +1714,9 @@ def test_update_subnet_dhcp_options_in_ovn_ipv6(self):
17121714
self.mech_driver.nb_ovn.add_dhcp_options.assert_called_once_with(
17131715
subnet['id'], **new_options)
17141716

1715-
def test_update_subnet_dhcp_options_in_ovn_ipv6_not_change(self):
1717+
@mock.patch.object(ovn_utils, 'get_system_dns_resolvers')
1718+
def test_update_subnet_dhcp_options_in_ovn_ipv6_not_change(self, gsd):
1719+
gsd.return_value = []
17161720
subnet = {'id': 'subnet-id', 'ip_version': 6, 'cidr': '10::0/64',
17171721
'gateway_ip': '10::1', 'enable_dhcp': True,
17181722
'ipv6_address_mode': 'dhcpv6-stateless',

0 commit comments

Comments
 (0)