From 909cf73ca0ee3582947fd766295fd0e5562f8751 Mon Sep 17 00:00:00 2001 From: Benjamin Schanzel Date: Tue, 5 Mar 2024 10:23:17 +0100 Subject: [PATCH] Store pool name in component registry Alongside other information about provider pools, store the configured name of a pool in the PoolComponent of the component registry. Change-Id: I509a6cfd42c24bc55f563fd13222af129015b727 --- nodepool/launcher.py | 1 + nodepool/tests/unit/test_zk.py | 1 + nodepool/zk/components.py | 1 + 3 files changed, 3 insertions(+) diff --git a/nodepool/launcher.py b/nodepool/launcher.py index 607e932d3..555e747af 100644 --- a/nodepool/launcher.py +++ b/nodepool/launcher.py @@ -455,6 +455,7 @@ class PoolWorker(threading.Thread, stats.StatsReporter): pool_config = self.getPoolConfig() self.component_info.content.update({ 'id': self.launcher_id, + 'name': self.pool_name, 'provider_name': self.provider_name, 'supported_labels': list(pool_config.labels), 'state': self.component_info.RUNNING, diff --git a/nodepool/tests/unit/test_zk.py b/nodepool/tests/unit/test_zk.py index d5e01a065..fb14324c2 100644 --- a/nodepool/tests/unit/test_zk.py +++ b/nodepool/tests/unit/test_zk.py @@ -36,6 +36,7 @@ class TestComponentRegistry(tests.DBTestCase): version=get_version_string()) launcher.content.update({ 'id': "launcher-Poolworker.provider-main-" + uuid.uuid4().hex, + 'name': 'main', 'provider_name': 'provider', 'supported_labels': [], 'state': launcher.RUNNING, diff --git a/nodepool/zk/components.py b/nodepool/zk/components.py index d2917ef59..a773ce532 100644 --- a/nodepool/zk/components.py +++ b/nodepool/zk/components.py @@ -215,6 +215,7 @@ class PoolComponent(BaseComponent): super().__init__(*args, **kwargs) self.initial_state = { "id": None, + "name": None, "provider_name": None, "supported_labels": [], "priority": 100,