Skip to content

fix mismerge #107

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
sebroy merged 1 commit into from
Mar 17, 2025
Merged

fix mismerge #107

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 @@ -421,7 +421,7 @@ def _add_network_config_from_opc_imds(self, set_primary: bool = False):
# Are there plans to switch to v2?
interface_config = {
"mtu": MTU,
"match": {"macaddress": mac_address},
"match": {"name": name},
"dhcp6": False,
"dhcp4": is_primary,
}
Expand Down
2 changes: 0 additions & 2 deletions tests/unittests/sources/test_oracle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,15 +608,13 @@ def test_secondary_nic_v2_ipv6_only(self, set_primary, oracle_ds):

assert primary_cfg["dhcp4"] is False
assert primary_cfg["dhcp6"] is True
assert "02:00:17:0d:6b:be" == primary_cfg["match"]["macaddress"]
assert 9000 == primary_cfg["mtu"]
assert "addresses" not in primary_cfg

assert "ens4" in nic_cfg
secondary_cfg = nic_cfg["ens4"]
assert secondary_cfg["dhcp4"] is False
assert secondary_cfg["dhcp6"] is False
assert "02:00:17:18:f6:ff" == secondary_cfg["match"]["macaddress"]
assert 9000 == secondary_cfg["mtu"]

assert 1 == len(secondary_cfg["addresses"])
Expand Down
Loading