openstack
/
neutron
Code Issues Proposed changes

Merge "Mock check if ipv6 is enabled in L3 agent unit tests" into stable/rocky

This commit is contained in:
Zuul 2020-02-25 10:46:51 +00:00 committed by Gerrit Code Review
parent 3282226f41 4e31dbaa5b
commit 051847f55a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/tests/unit/agent/l3/test_agent.py
View File

@ -291,7 +291,11 @@ class TestBasicRouterOperations(BasicRouterOperationsFramework):
destroy_metadata_proxy.assert_not_called()
def _test__configure_ipv6_params_helper(self, state, gw_port_id):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
with mock.patch(
'neutron.common.ipv6_utils.is_enabled_and_bind_by_default',
return_value=True):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
router_info = l3router.RouterInfo(agent, _uuid(), {}, **self.ri_kwargs)
if gw_port_id:
router_info.ex_gw_port = {'id': gw_port_id}