From 4c4e8aefdbff1c0db9e217de67162d836a3b2a17 Mon Sep 17 00:00:00 2001 From: Benjamin Schanzel Date: Fri, 23 Feb 2024 14:20:09 +0100 Subject: [PATCH] Metastatic: Copy cloud attribute from backing node Like done with several other meta data, copy the `cloud` attribute from the backing node to the metastatic node. Change-Id: Id83b3e09147baaab8a85ace4d5beba77d1eb87bd --- nodepool/driver/metastatic/adapter.py | 1 + nodepool/tests/unit/test_driver_metastatic.py | 1 + 2 files changed, 2 insertions(+) diff --git a/nodepool/driver/metastatic/adapter.py b/nodepool/driver/metastatic/adapter.py index e39f9a872..5661910ab 100644 --- a/nodepool/driver/metastatic/adapter.py +++ b/nodepool/driver/metastatic/adapter.py @@ -117,6 +117,7 @@ class MetastaticInstance(statemachine.Instance): self.private_ipv4 = backing_node.private_ipv4 self.az = backing_node.az self.region = backing_node.region + self.cloud = backing_node.cloud # Image overrides: self.username = backing_node.username self.python_path = backing_node.python_path diff --git a/nodepool/tests/unit/test_driver_metastatic.py b/nodepool/tests/unit/test_driver_metastatic.py index 7215c5ea0..6e1139696 100644 --- a/nodepool/tests/unit/test_driver_metastatic.py +++ b/nodepool/tests/unit/test_driver_metastatic.py @@ -106,6 +106,7 @@ class TestDriverMetastatic(tests.DBTestCase): self.assertEqual(bn1.python_path, node1.python_path) self.assertEqual('auto', node1.python_path) self.assertEqual(bn1.shell_type, node1.shell_type) + self.assertEqual(bn1.cloud, node1.cloud) self.assertEqual(None, node1.shell_type) self.assertEqual(bn1.host_keys, node1.host_keys) self.assertEqual(['ssh-rsa FAKEKEY'], node1.host_keys)