Skip to content
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

Jump to bottom

NAS-119681 / 22.12.1 / Add guest agent channel in devices (by Qubad786) #10462

Merged
merged 2 commits into from Jan 17, 2023
Merged

NAS-119681 / 22.12.1 / Add guest agent channel in devices (by Qubad786) #10462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18534e1
Add guest agent channel in devices
Qubad786 Jan 13, 2023
f2e5b56
fix display xml test
Qubad786 Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/middlewared/middlewared/plugins/vm/supervisor/domain_xml.py
View file
Open in desktop
Expand Up @@ -177,6 +177,9 @@ def devices_xml(vm_data, context):
}
))

devices.append(create_element('channel', type='unix', attribute_dict={
'children': [create_element('target', type='virtio', name='org.qemu.guest_agent.0')]
}))
devices.append(create_element('serial', type='pty'))
return create_element('devices', attribute_dict={'children': devices})

Expand Down
27 changes: 17 additions & 10 deletions src/middlewared/middlewared/pytest/unit/plugins/vm/test_vm_devices_xml.py
View file
Open in desktop
Expand Up @@ -7,10 +7,13 @@
from middlewared.plugins.vm.supervisor.domain_xml import devices_xml
from middlewared.pytest.unit.middleware import Middleware

GUEST_CHANEL = '<channel type="unix"><target type="virtio" name="org.qemu.guest_agent.0" /></channel>'


@pytest.mark.parametrize('vm_data,expected_xml', [
({'ensure_display_device': False, 'devices': []}, '<devices><serial type="pty" /></devices>'),
({'ensure_display_device': True, 'devices': []}, '<devices><video /><serial type="pty" /></devices>'),
({'ensure_display_device': False, 'devices': []}, f'<devices>{GUEST_CHANEL}<serial type="pty" /></devices>'),
({'ensure_display_device': True, 'devices': []},
f'<devices><video />{GUEST_CHANEL}<serial type="pty" /></devices>'),
])
def test_basic_devices_xml(vm_data, expected_xml):
assert etree.tostring(devices_xml(vm_data, {'devices': []})).decode().strip() == expected_xml
Expand All @@ -22,7 +25,7 @@ def test_basic_devices_xml(vm_data, expected_xml):
'dtype': 'CDROM',
}]}, '<devices><disk type="file" device="cdrom"><driver name="qemu" type="raw" />'
'<source file="/mnt/tank/disk.iso" /><target dev="sda" bus="sata" /><boot order="1" />'
'</disk><serial type="pty" /></devices>'
f'</disk>{GUEST_CHANEL}<serial type="pty" /></devices>'
),
])
def test_cdrom_xml(vm_data, expected_xml):
Expand Down Expand Up @@ -50,7 +53,7 @@ def test_cdrom_xml(vm_data, expected_xml):
}]}, '<devices><graphics type="spice" port="5912"><listen type="address" address="0.0.0.0" /></graphics>'
'<controller type="usb" model="nec-xhci" /><input type="tablet" bus="usb" /><video>'
'<model type="qxl"><resolution x="1024" y="768" /></model></video><channel type="spicevmc">'
'<target type="virtio" name="com.redhat.spice.0" /></channel><serial type="pty" /></devices>'
f'<target type="virtio" name="com.redhat.spice.0" /></channel>{GUEST_CHANEL}<serial type="pty" /></devices>'
),
])
def test_display_xml(vm_data, expected_xml):
Expand All @@ -72,7 +75,8 @@ def test_display_xml(vm_data, expected_xml):
},
'dtype': 'NIC',
}]}, '<devices><interface type="bridge"><source bridge="br0" /><model type="virtio" />'
'<mac address="00:a0:99:7e:bb:8a" /></interface><serial type="pty" /></devices>'
'<mac address="00:a0:99:7e:bb:8a" /></interface>'
f'{GUEST_CHANEL}<serial type="pty" /></devices>'
),
({'ensure_display_device': False, 'devices': [{
'attributes': {
Expand All @@ -83,7 +87,8 @@ def test_display_xml(vm_data, expected_xml):
},
'dtype': 'NIC',
}]}, '<devices><interface type="direct" trustGuestRxFilters="no"><source dev="ens3" mode="bridge" />'
'<model type="virtio" /><mac address="00:a0:99:7e:bb:8a" /></interface><serial type="pty" /></devices>'
'<model type="virtio" /><mac address="00:a0:99:7e:bb:8a" /></interface>'
f'{GUEST_CHANEL}<serial type="pty" /></devices>'
),
({'ensure_display_device': False, 'devices': [{
'attributes': {
Expand All @@ -94,7 +99,8 @@ def test_display_xml(vm_data, expected_xml):
},
'dtype': 'NIC',
}]}, '<devices><interface type="direct" trustGuestRxFilters="yes"><source dev="ens3" mode="bridge" />'
'<model type="virtio" /><mac address="00:a0:99:7e:bb:8a" /></interface><serial type="pty" /></devices>'
'<model type="virtio" /><mac address="00:a0:99:7e:bb:8a" /></interface>'
f'{GUEST_CHANEL}<serial type="pty" /></devices>'
),
])
@patch('middlewared.plugins.vm.devices.nic.NIC.is_available', lambda *args: True)
Expand Down Expand Up @@ -122,7 +128,7 @@ def setup_nic_attach(self):
'dtype': 'DISK',
}]}, '<devices><disk type="block" device="disk"><driver name="qemu" type="raw" cache="none" io="threads" />'
'<source dev="/dev/zvol/pool/boot_1" /><target bus="sata" dev="sda" /><boot order="1" />'
'</disk><serial type="pty" /></devices>'
f'</disk>{GUEST_CHANEL}<serial type="pty" /></devices>'
),
])
def test_disk_xml(vm_data, expected_xml):
Expand All @@ -146,7 +152,7 @@ def test_disk_xml(vm_data, expected_xml):
'dtype': 'RAW',
}]}, '<devices><disk type="file" device="disk"><driver name="qemu" type="raw" cache="none" io="threads" />'
'<source file="/mnt/tank/somefile" /><target bus="sata" dev="sda" /><boot order="1" />'
'</disk><serial type="pty" /></devices>'
f'</disk>{GUEST_CHANEL}<serial type="pty" /></devices>'
),
({'ensure_display_device': False, 'devices': [{
'attributes': {
Expand All @@ -159,7 +165,8 @@ def test_disk_xml(vm_data, expected_xml):
'dtype': 'RAW',
}]}, '<devices><disk type="file" device="disk"><driver name="qemu" type="raw" cache="none" io="threads" />'
'<source file="/mnt/tank/somefile" /><target bus="sata" dev="sda" /><boot order="1" />'
'<blockio logical_block_size="512" physical_block_size="512" /></disk><serial type="pty" /></devices>'
'<blockio logical_block_size="512" physical_block_size="512" /></disk>'
f'{GUEST_CHANEL}<serial type="pty" /></devices>'
),
])
def test_raw_xml(vm_data, expected_xml):
Expand Down