Skip to content
Merged
Changes from all commits
Commits
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
21 changes: 11 additions & 10 deletions tests/integration_tests/modules/test_combined.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,28 +288,29 @@ def test_instance_json_lxd_vm(self, class_client: IntegrationInstance):
# instance-id should be a UUID
try:
uuid.UUID(v1_data["instance_id"])
except ValueError:
except ValueError as e:
raise AssertionError(
f"LXD instance-id is not a UUID: {v1_data['instance_id']}"
)
) from e
assert v1_data["subplatform"] == subplatform
else:
cloud_name = "unknown"
subplatform = "seed-dir (/var/lib/cloud/seed/nocloud-net)"
# Pre-Jammy instance-id and instance.name are synonymous
assert v1_data["instance_id"] == client.instance.name
assert any(
[
"/var/lib/cloud/seed/nocloud-net"
in v1_data["subplatform"],
"/dev/sr0" in v1_data["subplatform"],
]
)
assert v1_data["cloud_name"] == cloud_name
assert v1_data["subplatform"] == subplatform
assert v1_data["platform"] == "lxd"
assert v1_data["cloud_id"] == "lxd"
assert f"{v1_data['cloud_id']}" == client.read_from_file(
"/run/cloud-init/cloud-id-lxd"
)
assert any(
[
"/var/lib/cloud/seed/nocloud-net" in v1_data["subplatform"],
"/dev/sr0" in v1_data["subplatform"],
]
)

assert v1_data["availability_zone"] is None
assert v1_data["local_hostname"] == client.instance.name
assert v1_data["region"] is None
Expand Down