Skip to content

upcloud, digitalocean: recompute network_config when set to UNSET #7072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sundeep8967 wants to merge 2 commits into
base: main
Choose a base branch
from
+65 −3
Open

upcloud, digitalocean: recompute network_config when set to UNSET #7072

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7004ba5
DataSourceUpCloud: recompute network_config when set to UNSET
sundeep8967 Sep 5, 2026
d9392de
upcloud,digitalocean: check UNSET sentinel in network_config property
sundeep8967 Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cloudinit/sources/DataSourceUpCloud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def network_config(self):
due to reconfiguration.
"""

if self._network_config:
if self._network_config and self._network_config != sources.UNSET:
return self._network_config

raw_network_config = self.metadata.get("network")
Expand Down
7 changes: 7 additions & 0 deletions tests/unittests/sources/test_upcloud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,13 @@ def test_network_configuration(self, m_get_by_mac, mock_readmd, ds):
UC_METADATA.get("network").get("dns")[1] == dns.get("address")[1]
)

# GH-7067: Verify recomputation when _network_config is UNSET

@blackboxsw blackboxsw Sep 9, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably want a distinct unittest for this. It's not as discoverable when added to the middle of an existing test.

ds._network_config = sources.UNSET
recomputed_netcfg = ds.network_config
assert recomputed_netcfg != sources.UNSET
assert isinstance(recomputed_netcfg, dict)
assert 1 == recomputed_netcfg.get("version")


class TestUpCloudDatasourceLoading:
def test_get_datasource_list_returns_in_local(self):
Expand Down
Loading