Skip to content

Revert "Ensure system_cfg read before ds net config on Oracle (#1174)" #1326

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

Merged
blackboxsw merged 1 commit into from
Mar 11, 2022
+4 −33
Merged

Revert "Ensure system_cfg read before ds net config on Oracle (#1174)" #1326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/DataSourceOracle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ class DataSourceOracle(sources.DataSource):
vendordata_pure = None
network_config_sources = (
sources.NetworkConfigSource.cmdline,
sources.NetworkConfigSource.system_cfg,
sources.NetworkConfigSource.ds,
sources.NetworkConfigSource.initramfs,
sources.NetworkConfigSource.system_cfg,
)

_network_config = sources.UNSET
Expand Down
27 changes: 0 additions & 27 deletions tests/integration_tests/network/test_net_config_load.py
View file
Open in desktop

This file was deleted.

8 changes: 3 additions & 5 deletions tests/unittests/sources/test_oracle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,14 +920,12 @@ def test_secondary_nic_failure_isnt_blocking(
assert network_config == m_read_initramfs_config.return_value
assert "Failed to parse secondary network configuration" in caplog.text

def test_ds_network_cfg_order(self, _m):
"""Ensure that DS net config is preferred over initramfs config
but less than system config."""
def test_ds_network_cfg_preferred_over_initramfs(self, _m):
"""Ensure that DS net config is preferred over initramfs config"""
config_sources = oracle.DataSourceOracle.network_config_sources
system_idx = config_sources.index(NetworkConfigSource.system_cfg)
ds_idx = config_sources.index(NetworkConfigSource.ds)
initramfs_idx = config_sources.index(NetworkConfigSource.initramfs)
assert system_idx < ds_idx < initramfs_idx
assert ds_idx < initramfs_idx


# vi: ts=4 expandtab