From 27da92d634168960e15aa9faf3776bcf357d46dd Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Mon, 8 Feb 2021 09:18:45 +0000 Subject: [PATCH] [FT] Reset "AgentCache" singleton in functional tests Reset "AgentCache" singleton instance after each functional test execution. That will remove any stored information from the previous tests. Related-Bug: #1914754 Change-Id: Ibd8897ec04843a5d6eb8639cc0c6ef0e2b9d2a3b --- neutron/tests/functional/base.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neutron/tests/functional/base.py b/neutron/tests/functional/base.py index d9099815018..8bec53ba40a 100644 --- a/neutron/tests/functional/base.py +++ b/neutron/tests/functional/base.py @@ -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 @@ -197,6 +198,10 @@ class TestOVNFunctionalBase(test_plugin.Ml2PluginV2TestCase, self.temp_dir = self.useFixture(fixtures.TempDir()).path self._start_ovsdb_server_and_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()