mirror of
https://github.com/retspen/webvirtcloud
synced 2026-11-08 11:16:47 +00:00
5def4e41fd
- change_network detached the NIC and attached one built from scratch, dropping its QoS, link state and other settings. It now edits the NIC of the persistent definition in place and defines once; a running VM gets the change at its next start, as the UI already says. - add_network, delete_network and set_link_state did nothing on a paused VM, and set_link_state rewrote the persistent NIC from the live XML. They now update the running definition when the VM is active and the persistent one always, each from its own XML. - Boot and console edits used xml.etree, which renamed the namespace prefixes of other tools' metadata (<app:info> became <ns0:info>); they use lxml now. - The NIC table and the clone form are filled from the persistent definition (Instance.config_networks, config_disks), so a pending NIC change is shown and can be edited again. A live test runs 18 domain edits on stopped, running and paused VMs whose definition has elements WebVirtCloud does not manage, and checks for each the effect, that nothing else in the persistent definition changed, and that persistent-only edits leave the running VM alone.
80 lines
3.2 KiB
Python
80 lines
3.2 KiB
Python
import unittest
|
|
from unittest.mock import MagicMock
|
|
|
|
from django.conf import settings
|
|
|
|
if not settings.configured:
|
|
settings.configure(MAC_OUI="52:54:10")
|
|
|
|
from libvirt import libvirtError
|
|
from vrtManager.instance import wvmInstance
|
|
|
|
DOMAIN_XML = """<domain><devices>
|
|
<interface type='network'><mac address='52:54:00:00:00:01'/><source network='default'/><model type='virtio'/></interface>
|
|
<interface type='network'><mac address='52:54:00:00:00:02'/><source network='default'/><model type='virtio'/>
|
|
<bandwidth><outbound average='1000'/></bandwidth><link state='down'/>
|
|
<address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/></interface>
|
|
</devices></domain>"""
|
|
|
|
|
|
def stopped_instance():
|
|
inst = wvmInstance.__new__(wvmInstance)
|
|
inst.instance = MagicMock()
|
|
inst.wvm = MagicMock()
|
|
inst._XMLDesc = MagicMock(return_value=DOMAIN_XML)
|
|
inst.get_status = MagicMock(return_value=5)
|
|
return inst
|
|
|
|
|
|
class TestChangeNetwork(unittest.TestCase):
|
|
def test_edits_the_nic_in_place_and_keeps_its_other_settings(self):
|
|
from lxml import etree
|
|
|
|
inst = stopped_instance()
|
|
inst.change_network("52:54:00:00:00:02", "52:54:00:00:00:03", "br0", "bridge", "e1000", "clean-traffic")
|
|
|
|
defined = etree.fromstring(inst.wvm.defineXML.call_args[0][0])
|
|
first, second = defined.findall("devices/interface")
|
|
self.assertEqual(first.find("mac").get("address"), "52:54:00:00:00:01")
|
|
self.assertEqual(second.get("type"), "bridge")
|
|
self.assertEqual(second.find("mac").get("address"), "52:54:00:00:00:03")
|
|
self.assertEqual(second.find("source").attrib, {"bridge": "br0"})
|
|
self.assertEqual(second.find("model").get("type"), "e1000")
|
|
self.assertEqual(second.find("filterref").get("filter"), "clean-traffic")
|
|
# F-06: QoS, link state and the PCI address survive
|
|
self.assertEqual(second.find("bandwidth/outbound").get("average"), "1000")
|
|
self.assertEqual(second.find("link").get("state"), "down")
|
|
self.assertEqual(second.find("address").get("bus"), "0x02")
|
|
|
|
def test_unknown_old_mac_changes_nothing(self):
|
|
inst = stopped_instance()
|
|
with self.assertRaises(libvirtError):
|
|
inst.change_network("52:54:00:00:00:09", "52:54:00:00:00:03", "default", "net", "virtio", "")
|
|
inst.wvm.defineXML.assert_not_called()
|
|
|
|
|
|
class TestAddNetworkXml(unittest.TestCase):
|
|
def attached(self, **kwargs):
|
|
from lxml import etree
|
|
|
|
inst = stopped_instance()
|
|
inst.add_network(**kwargs)
|
|
return etree.fromstring(inst.instance.attachDeviceFlags.call_args[0][0])
|
|
|
|
def test_posted_values_cannot_inject_elements(self):
|
|
iface = self.attached(
|
|
mac_address="52:54:00:00:00:05",
|
|
source="default",
|
|
model="virtio'/><filesystem type='mount'/><model type='x",
|
|
nwfilter="f'/><evil/>",
|
|
)
|
|
self.assertEqual([el.tag for el in iface], ["mac", "source", "model", "filterref"])
|
|
self.assertEqual(iface.find("model").get("type"), "virtio'/><filesystem type='mount'/><model type='x")
|
|
|
|
def test_missing_mac_is_left_to_libvirt(self):
|
|
iface = self.attached(mac_address="", source="default")
|
|
self.assertIsNone(iface.find("mac"))
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|