From fd423f7b1bd3e73631eb3588ea46140b0274ce7a Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Thu, 1 Dec 2022 16:26:25 +0100 Subject: [PATCH] Reset the MeterIDGenerator singleton after each test Closes-Bug: #1998474 Related-Bug: #1964342 Change-Id: I46853e65644d85ca0374b07a8d9e5816a82bcb36 --- .../openvswitch/agent/extension_drivers/test_qos_driver.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/extension_drivers/test_qos_driver.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/extension_drivers/test_qos_driver.py index 15988b45a0d..e5a1a8cbfd0 100644 --- a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/extension_drivers/test_qos_driver.py +++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/extension_drivers/test_qos_driver.py @@ -100,6 +100,12 @@ class QosOVSAgentDriverTestCase(ovs_test_base.OVSAgentConfigTestBase): self.port = self._create_fake_port(self.qos_policy.id) self.qos_driver.br_int.get_port_tag_by_name = mock.Mock( return_value=1) + self.addCleanup(self._reset_meter_id_generator_singleton) + + @staticmethod + def _reset_meter_id_generator_singleton(): + if hasattr(qos_driver.MeterIDGenerator, '_instance'): + del(qos_driver.MeterIDGenerator._instance) def _create_bw_limit_rule_obj(self, direction): rule_obj = rule.QosBandwidthLimitRule()