Skip to content

Allow predefined VM UUIDs #83

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
dahoat-sprecher wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow predefined VM UUIDs #83

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
15 changes: 12 additions & 3 deletions tests/test_vm_manager_libvirt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,22 @@ def test_name_replaced(self, vm_xml_path):
result = vml._create_xml(xml, "myvm")
assert "<name>myvm</name>" in result

def test_uuid_replaced(self, vm_xml_path):
def test_uuid_preserved_when_provided(self, vm_xml_path):
with open(vm_xml_path) as f:
xml = f.read()
result = vml._create_xml(xml, "myvm")
# Original UUID should be gone
assert "7b48b1fe-066a-41a6-aef4-f0a9c028f719" not in result
assert "7b48b1fe-066a-41a6-aef4-f0a9c028f719" in result

def test_uuid_generated_when_not_provided(self, vm_xml_path):
with open(vm_xml_path) as f:
xml = f.read()
# Remove the uuid element from the XML
xml = xml.replace(
"<uuid>7b48b1fe-066a-41a6-aef4-f0a9c028f719</uuid>", ""
)
result = vml._create_xml(xml, "myvm")
assert "<uuid>" in result
assert "7b48b1fe-066a-41a6-aef4-f0a9c028f719" not in result


class TestCreate:
Expand Down
11 changes: 8 additions & 3 deletions vm_manager/vm_manager_cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,18 @@ def _create_xml(xml, vm_name, target_disk_bus="virtio"):
xml_root = ElementTree.fromstring(xml)
try:
xml_root.remove(xml_root.findall("./name")[0])
xml_root.remove(xml_root.findall("./uuid")[0])
except IndexError:
pass
existing_uuid = xml_root.findall("./uuid")
if not existing_uuid or not existing_uuid[0].text:
try:
xml_root.remove(existing_uuid[0])
except IndexError:
pass
uuid_element = ElementTree.SubElement(xml_root, "uuid")
uuid_element.text = str(uuid.uuid4())
name_element = ElementTree.SubElement(xml_root, "name")
name_element.text = vm_name
name_element = ElementTree.SubElement(xml_root, "uuid")
name_element.text = str(uuid.uuid4())
rbd_secret = None
hosts_list = _get_ceph_hosts_xml()
with LibVirtManager() as libvirt_manager:
Expand Down
11 changes: 8 additions & 3 deletions vm_manager/vm_manager_libvirt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,18 @@ def _create_xml(xml, vm_name):
xml_root = ElementTree.fromstring(xml)
try:
xml_root.remove(xml_root.findall("./name")[0])
xml_root.remove(xml_root.findall("./uuid")[0])
except IndexError:
pass
existing_uuid = xml_root.findall("./uuid")
if not existing_uuid or not existing_uuid[0].text:
try:
xml_root.remove(existing_uuid[0])
except IndexError:
pass
uuid_element = ElementTree.SubElement(xml_root, "uuid")
uuid_element.text = str(uuid.uuid4())
name_element = ElementTree.SubElement(xml_root, "name")
name_element.text = vm_name
name_element = ElementTree.SubElement(xml_root, "uuid")
name_element.text = str(uuid.uuid4())

return ElementTree.tostring(xml_root).decode()

Expand Down