openstack
/
neutron
Code Issues Proposed changes

Merge "[FT] Reset "AgentCache" singleton in functional tests"

This commit is contained in:
Zuul 2021-03-01 13:16:41 +00:00 committed by Gerrit Code Review
parent 74953df991 27da92d634
commit 77ee0847f5
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/tests/functional/base.py
View File

@ -41,6 +41,7 @@ from neutron.conf.plugins.ml2.drivers.ovn import ovn_conf
# the SqlFixture
from neutron.db import models # noqa
from neutron import manager
from neutron.plugins.ml2.drivers.ovn.agent import neutron_agent
from neutron.plugins.ml2.drivers.ovn.mech_driver.ovsdb import worker
from neutron.plugins.ml2.drivers import type_geneve # noqa
from neutron import service # noqa
@ -200,6 +201,10 @@ class TestOVNFunctionalBase(test_plugin.Ml2PluginV2TestCase,
self.maintenance_worker = maintenance_worker
self._start_idls()
self._start_ovn_northd()
self.addCleanup(self._reset_agent_cache_singleton)
def _reset_agent_cache_singleton(self):
neutron_agent.AgentCache._instance = None
def _get_install_share_path(self):
lookup_paths = set()