openstack
/
neutron
Code Issues Proposed changes

Merge "Put monitors dictionary back in MetadataDriverBase class"

This commit is contained in:
Zuul 2024-05-16 01:32:41 +00:00 committed by Gerrit Code Review
parent 2fc5f37669 5b62e27154
commit 6c5a052ac0
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/agent/metadata/driver_base.py
View File

@ -159,6 +159,8 @@ class HaproxyConfiguratorBase(object):
class MetadataDriverBase(object, metaclass=abc.ABCMeta):
monitors = {}
@staticmethod
@abc.abstractmethod
def haproxy_configurator():
@ -253,6 +255,8 @@ class MetadataDriverBase(object, metaclass=abc.ABCMeta):
return
monitor.register(uuid, METADATA_SERVICE_NAME, pm)
cls.monitors[uuid] = pm
@classmethod
def destroy_monitored_metadata_proxy(cls, monitor, uuid, conf, ns_name):
monitor.unregister(uuid, METADATA_SERVICE_NAME)
@ -272,6 +276,8 @@ class MetadataDriverBase(object, metaclass=abc.ABCMeta):
configurator = cls.haproxy_configurator()
configurator.cleanup_config_file(uuid, cfg.CONF.state_path)
cls.monitors.pop(uuid, None)
@classmethod
def _get_metadata_proxy_process_manager(cls, router_id, conf, ns_name=None,
callback=None):

1
neutron/tests/unit/agent/metadata/test_driver.py
View File

@ -312,6 +312,7 @@ class TestMetadataDriverProcess(base.BaseTestCase):
network_id=network_id)
error_log.assert_called_once()
process_monitor.register.assert_not_called()
self.assertNotIn(network_id, metadata_driver.MetadataDriver.monitors)
def test_create_config_file_wrong_user(self):
with mock.patch('pwd.getpwnam', side_effect=KeyError):

1
neutron/tests/unit/agent/ovn/metadata/test_driver.py
View File

@ -197,6 +197,7 @@ class TestMetadataDriverProcess(base.BaseTestCase):
error_log.assert_called_once()
process_monitor.register.assert_not_called()
self.assertNotIn(network_id, metadata_driver.MetadataDriver.monitors)
def test_create_config_file_wrong_user(self):
with mock.patch('pwd.getpwnam', side_effect=KeyError):