j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2026-11-09 11:46:49 +00:00
Code Issues Projects Releases Wiki Activity

fix(interfaces): interface changes roll back as one, a running one is not deleted, each interface is read once

Browse source 
Plan reviewed with Codex; tried on a udev host (AlmaLinux 10) and a
netcf one (AlmaLinux 8).

- Changes are one change of the host's configuration (libvirt's
  interface change transaction): a bridge that does not start used to
  be undefined, leaving its member without the addresses and start
  mode the bridge took from it; now the whole change rolls back, the
  member's own configuration too, and so does a commit libvirt refuses.
  A rollback that fails too is reported with the failure, saying the
  host's configuration may be changed.
  Deleting a bridge, which defines its
  members again on their own, is one change as well.
- A running interface is not deleted: the page hid Delete, but a post
  deleted it. A bridge with addresses and several members is refused
  (which member takes the addresses is the user's choice); the
  confirmation says that its members are defined again.
- A bridge takes only a device in no bridge, bond or VLAN as the host
  has them configured, at any depth (a bridge's bond's devices), not
  the loopback, a libvirt network's bridge or a VM's tap; an ethernet
  interface configures only such a device too.
- Whether the host can change interfaces: unsupported or refused by
  its access rules is a no, bad XML a yes, anything else (the
  connection, the login) is raised instead of taken for a yes. A page
  whose host could not be read offers no actions.
- Reads: the list reads each interface's XML once from one listing
  (listAllInterfaces: every state, not the active and the defined ones
  apart); a page reads the running and the saved definition once each
  (cached_property). netcf writes a link speed of -1 for a card that
  has none (a virtio one) and then refuses its own XML: the saved one
  is read instead, where virsh and the page failed. Name and MAC come
  from libvirt's object, without a call. Each family says how it is
  addressed (DHCP, autoconf, static or none) and every address, its
  prefix where it has one; no
  address is not "DHCP" any more. A bridge's members carry their link
  state and speed; an unknown speed (0, -1, 4294967295) is none.
- The interface API lists from the same reader. get_details,
  get_bridge, get_bridge_slave_ifaces and the per-family getters go.
This commit is contained in:
catborise 2026-10-28 22:07:48 +03:00
parent 0ee03c0971
commit 680dd5dad4
11 changed files with 421 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

3
interfaces/tests/test_audit_rows.py
View file

@ -21,7 +21,8 @@ class InterfaceRowTests(TestCase):
def test_interface_actions(self, ifaces, iface):
ifaces.return_value.can_change_interfaces.return_value = True
ifaces.return_value.get_net_devices.return_value = ["eth0"]
ifaces.return_value.get_ifaces.return_value = []
ifaces.return_value.get_member_candidates.return_value = ["eth0"]
ifaces.return_value.get_ifaces_info.return_value = []
iface.return_value.can_change_interfaces.return_value = True
self.client.post(reverse("interfaces", args=[self.compute.id]), {
"create": "", "name": "br1", "itype": "bridge", "start_mode": "onboot", "netdev": "eth0",

62
interfaces/tests/test_delete.py
View file

@ -1,23 +1,33 @@
"""Deleting a host interface: netcf removes a bridge's members with the
bridge, so they are defined again on their own (as virsh iface-unbridge)."""
"""Deleting a host interface: a stopped one only; netcf removes a bridge's
members with the bridge, so they are defined again on their own (as virsh
iface-unbridge), all in one change of the host's configuration, rolled back
on a failure; a bridge with addresses and several members is refused."""
from unittest.mock import MagicMock
import libvirt
from django.test import SimpleTestCase
from lxml import etree
from vrtManager.interface import wvmInterface
from vrtManager.util import OperationError
ADDRESS = "<protocol family='ipv4'><ip address='192.0.2.10' prefix='24'/></protocol>"
BOND = "<interface type='bond' name='bond0'><bond mode='active-backup'><interface type='ethernet' name='eth1'/></bond></interface>"
def delete(xml):
def interface(xml, active=False):
conn = wvmInterface.__new__(wvmInterface)
conn.iface = MagicMock()
conn.iface.XMLDesc.return_value = xml
conn.iface = MagicMock(**{"XMLDesc.return_value": xml, "isActive.return_value": active, "name.return_value": "br1"})
conn.wvm = MagicMock()
return conn
def delete(xml):
conn = interface(xml)
conn.delete_iface()
conn.iface.undefine.assert_called_once_with()
conn.wvm.changeBegin.assert_called_once_with(0)
conn.wvm.changeCommit.assert_called_once_with(0)
return [etree.fromstring(call.args[0]) for call in conn.wvm.interfaceDefineXML.call_args_list]
@ -30,9 +40,9 @@ class DeleteInterfaceTestCase(SimpleTestCase):
self.assertEqual(bond.xpath("start/@mode"), ["onboot"])
self.assertEqual(bond.xpath("protocol/ip/@address"), ["192.0.2.10"])
def test_several_members_take_the_start_mode_but_no_address(self):
def test_several_members_take_the_start_mode(self):
members = delete(
f"<interface type='bridge' name='br1'><start mode='onboot'/>{ADDRESS}<bridge>"
"<interface type='bridge' name='br1'><start mode='onboot'/><bridge>"
"<interface type='ethernet' name='eth1'/><interface type='ethernet' name='eth2'/></bridge></interface>"
)
self.assertEqual([m.get("name") for m in members], ["eth1", "eth2"])
@ -40,5 +50,43 @@ class DeleteInterfaceTestCase(SimpleTestCase):
self.assertEqual(member.xpath("start/@mode"), ["onboot"])
self.assertEqual(member.xpath("protocol"), [])
def test_a_bridge_with_addresses_and_several_members_is_refused(self):
# which member would take the addresses is the user's choice
conn = interface(f"<interface type='bridge' name='br1'>{ADDRESS}<bridge>"
"<interface type='ethernet' name='eth1'/><interface type='ethernet' name='eth2'/></bridge></interface>")
with self.assertRaisesRegex(OperationError, "has addresses and several members"):
conn.delete_iface()
conn.iface.undefine.assert_not_called()
def test_an_active_interface_is_refused(self):
conn = interface("<interface type='ethernet' name='eth1'/>", active=True)
with self.assertRaisesRegex(OperationError, "Stop interface br1 before deleting it"):
conn.delete_iface()
conn.iface.undefine.assert_not_called()
def test_a_member_libvirt_refuses_rolls_the_whole_change_back(self):
conn = interface(f"<interface type='bridge' name='br1'><bridge>{BOND}</bridge></interface>")
conn.wvm.interfaceDefineXML.side_effect = libvirt.libvirtError("netcf: cannot write")
with self.assertRaises(Exception):
conn.delete_iface()
conn.wvm.changeRollback.assert_called_once_with(0)
conn.wvm.changeCommit.assert_not_called()
def test_a_commit_libvirt_refuses_is_rolled_back(self):
conn = interface("<interface type='ethernet' name='eth1'/>")
conn.wvm.changeCommit.side_effect = libvirt.libvirtError("netcf: cannot commit")
with self.assertRaises(Exception):
conn.delete_iface()
conn.wvm.changeRollback.assert_called_once_with(0)
def test_an_interface_that_is_not_a_bridge_is_only_undefined(self):
self.assertEqual(delete(f"<interface type='ethernet' name='eth1'><start mode='onboot'/>{ADDRESS}</interface>"), [])
def test_a_rollback_that_fails_too_tells_both(self):
conn = interface("<interface type='ethernet' name='eth1'/>")
conn.wvm.changeCommit.side_effect = OperationError("netcf: cannot commit")
conn.wvm.changeRollback.side_effect = OperationError("netcf: cannot roll back")
with self.assertRaises(OperationError) as raised:
conn.delete_iface()
self.assertIn("netcf: cannot commit", str(raised.exception))
self.assertIn("netcf: cannot roll back", str(raised.exception))

37
interfaces/tests/test_forms.py
View file

@ -25,7 +25,7 @@ NETDEVS = ["eth0", "eth1", "enp129s0f0np0", "eth0.100", "bond-lan"]
def form(**values):
return AddInterface(data={**BASE, **values}, netdevs=NETDEVS)
return AddInterface(data={**BASE, **values}, netdevs=NETDEVS, members=NETDEVS)
class DefinedNameTestCase(SimpleTestCase):
@ -33,9 +33,9 @@ class DefinedNameTestCase(SimpleTestCase):
defined = ["br0", "bond-lan"] # as libvirt lists them
for values in ({"name": "br0"}, {"name": "bond-lan", "itype": "ethernet", "netdev": ""}):
with self.subTest(**values):
f = AddInterface(data={**BASE, **values}, netdevs=NETDEVS, defined=defined)
f = AddInterface(data={**BASE, **values}, netdevs=NETDEVS, members=NETDEVS, defined=defined)
self.assertEqual(f.errors["name"], [f"The host already defines interface {values['name']}"])
self.assertTrue(AddInterface(data={**BASE, "ipv6_type": "none"}, netdevs=NETDEVS, defined=defined).is_valid())
self.assertTrue(AddInterface(data={**BASE, "ipv6_type": "none"}, netdevs=NETDEVS, members=NETDEVS, defined=defined).is_valid())
class Ipv6FormTestCase(SimpleTestCase):
@ -74,6 +74,7 @@ class Ipv6FormTestCase(SimpleTestCase):
class Ipv6XmlTestCase(SimpleTestCase):
def xml(self, gw):
conn = wvmInterfaces.__new__(wvmInterfaces)
conn.wvm = MagicMock()
conn.define_iface = MagicMock()
conn.get_iface = MagicMock()
conn.get_iface.return_value.XMLDesc.return_value = "<interface type='ethernet' name='eth1'/>"
@ -158,6 +159,7 @@ class InterfaceNameTestCase(SimpleTestCase):
class Ipv4XmlTestCase(SimpleTestCase):
def xml(self, addr, gw):
conn = wvmInterfaces.__new__(wvmInterfaces)
conn.wvm = MagicMock()
conn.define_iface = MagicMock()
conn.get_iface = MagicMock()
conn.get_iface.return_value.XMLDesc.return_value = "<interface type='ethernet' name='eth1'/>"
@ -192,6 +194,13 @@ class HostDeviceTestCase(SimpleTestCase):
self.assertFalse(f.is_valid())
self.assertIn("name", f.errors)
def test_an_ethernet_interface_is_no_device_of_another_interface(self):
# netcf lists a bridge, not its members: eth1 is in br0 here
f = AddInterface(data={**BASE, "itype": "ethernet", "name": "eth1", "ipv6_type": "none"},
netdevs=NETDEVS, members=["eth0"], defined=["br0"])
self.assertFalse(f.is_valid())
self.assertIn("name", f.errors)
def no_interface(name):
err = libvirt.libvirtError("Interface not found: no interface with matching name '%s'" % name)
@ -205,6 +214,7 @@ class BridgeMemberXmlTestCase(SimpleTestCase):
def member(self, host_xml):
conn = wvmInterfaces.__new__(wvmInterfaces)
conn.wvm = MagicMock()
conn.define_iface = MagicMock()
def get_iface(name):
@ -253,6 +263,7 @@ class BridgeMemberXmlTestCase(SimpleTestCase):
def test_other_lookup_errors_are_not_hidden(self):
conn = wvmInterfaces.__new__(wvmInterfaces)
conn.wvm = MagicMock()
conn.define_iface = MagicMock()
err = libvirt.libvirtError("cannot recv data")
err.err = (libvirt.VIR_ERR_SYSTEM_ERROR, libvirt.VIR_FROM_RPC, str(err), 2, None, None, None, 0, 0)
@ -261,14 +272,17 @@ class BridgeMemberXmlTestCase(SimpleTestCase):
conn.create_iface("br1", "bridge", "onboot", "bond0", "none", "", "", "none", "", "", "on", 0)
self.assertFalse(conn.define_iface.called)
def test_an_interface_that_does_not_start_is_undefined(self):
def test_an_interface_that_does_not_start_is_rolled_back(self):
# the definition, and the member's own configuration it changed, as they were
conn = wvmInterfaces.__new__(wvmInterfaces)
conn.wvm = MagicMock()
conn.define_iface = MagicMock()
iface = conn.define_iface.return_value
iface.create.side_effect = libvirt.libvirtError("failed to bring up br1")
with self.assertRaises(libvirt.libvirtError):
conn.create_iface("br1", "ethernet", "onboot", "", "none", "", "", "none", "", "", "on", 0)
iface.undefine.assert_called_once_with()
conn.wvm.changeRollback.assert_called_once_with(0)
conn.wvm.changeCommit.assert_not_called()
class BridgeSettingsTestCase(SimpleTestCase):
@ -310,9 +324,10 @@ class CreateViewTestCase(TestCase):
for netdev, created in (("eth9", False), ("eth0", True)):
with self.subTest(netdev=netdev), patch("interfaces.views.wvmInterfaces") as conn_cls:
conn = conn_cls.return_value
conn.get_ifaces.return_value = []
conn.get_ifaces_info.return_value = []
conn.can_change_interfaces.return_value = True
conn.get_net_devices.return_value = ["eth0", "eth1"]
conn.get_member_candidates.return_value = ["eth0", "eth1"]
self.client.post(
reverse("interfaces", args=[compute.id]),
{**BASE, "netdev": netdev, "ipv6_type": "none", "create": ""},
@ -325,7 +340,7 @@ class CreateViewTestCase(TestCase):
self.client.force_login(admin)
with patch("interfaces.views.wvmInterfaces") as conn_cls:
conn = conn_cls.return_value
conn.get_ifaces.return_value = []
conn.get_ifaces_info.return_value = []
conn.can_change_interfaces.return_value = True
conn.get_net_devices.side_effect = RuntimeError("nodedev driver not running")
response = self.client.post(
@ -351,7 +366,7 @@ class UnchangeableHostTestCase(TestCase):
def interfaces_page(self, changeable, post=None):
with patch("interfaces.views.wvmInterfaces") as conn_cls:
conn = conn_cls.return_value
conn.get_ifaces.return_value = []
conn.get_ifaces_info.return_value = []
conn.can_change_interfaces.return_value = changeable
conn.get_net_devices.return_value = ["eth0", "eth1"]
url = reverse("interfaces", args=[self.compute.id])
@ -377,7 +392,6 @@ class UnchangeableHostTestCase(TestCase):
conn = conn_cls.return_value
conn.can_change_interfaces.return_value = changeable
conn.is_active.return_value = state
conn.get_bridge_slave_ifaces.return_value = []
url = reverse("interface", args=[self.compute.id, "br0"])
response = self.client.post(url, post) if post else self.client.get(url)
return conn, response
@ -395,11 +409,12 @@ class UnchangeableHostTestCase(TestCase):
_conn, response = self.interface_page(True, 0)
self.assertIn('name="start"', response.content.decode())
def test_a_host_that_could_not_be_read_keeps_the_page_as_it_was(self):
def test_a_host_that_could_not_be_read_offers_nothing(self):
# not knowing whether the host can change interfaces is not a yes
with patch("interfaces.views.wvmInterface", side_effect=libvirt.libvirtError("unreachable")):
page = self.client.get(reverse("interface", args=[self.compute.id, "br0"])).content.decode()
self.assertNotIn(self.NOTE, page)
self.assertIn("Interface start/stop/delete form", page)
self.assertNotIn("Interface start/stop/delete form", page)
def test_start_stop_and_delete_posts_change_nothing(self):
for action in ("start", "stop", "delete"):

92
interfaces/tests/test_reads.py Normal file
View file

@ -0,0 +1,92 @@
"""What the panel reads of the host's interfaces: each one's XML once, its
link as reported (an unknown speed is none), its members; which devices a new
bridge can take; how each family is addressed."""
from unittest.mock import MagicMock
import libvirt
from django.test import SimpleTestCase
from vrtManager.interface import wvmInterface, wvmInterfaces
BRIDGE = ("<interface type='bridge' name='br0'><mtu size='1500'/><link speed='4294967295' state='up'/>"
"<mac address='52:54:00:aa:01:02'/><bridge stp='on' delay='0'>"
"<interface type='ethernet' name='eno1'><link speed='1000' state='up'/><mac address='52:54:00:aa:01:03'/></interface>"
"</bridge></interface>")
ETHERNET = "<interface type='ethernet' name='eno2'><link state='down'/><mac address='52:54:00:aa:01:04'/></interface>"
def iface(xml, active=1):
name = xml.split("name='")[1].split("'")[0]
mac = xml.split("mac address='")[1].split("'")[0]
return MagicMock(**{"name.return_value": name, "MACString.return_value": mac, "XMLDesc.return_value": xml,
"isActive.return_value": active})
def error(code):
err = libvirt.libvirtError("refused")
err.get_error_code = lambda: code
return err
class ReadTests(SimpleTestCase):
def interfaces(self, *xmls, networks=()):
conn = wvmInterfaces.__new__(wvmInterfaces)
conn.wvm = MagicMock(**{"listAllInterfaces.return_value": [iface(x) for x in xmls],
"listAllNetworks.return_value": [MagicMock(**{"XMLDesc.return_value": n}) for n in networks]})
return conn
def test_each_interface_is_read_once(self):
conn = self.interfaces(BRIDGE, ETHERNET)
br0, eno2 = conn.get_ifaces_info()
self.assertEqual((br0["type"], br0["link"], br0["speed"], br0["mtu"], br0["mac"]),
("bridge", "up", None, "1500", "52:54:00:aa:01:02"))
self.assertEqual(br0["members"], [{"name": "eno1", "type": "ethernet", "mac": "52:54:00:aa:01:03",
"link": "up", "speed": "1000"}])
self.assertEqual((eno2["link"], eno2["members"]), ("down", []))
for listed in conn.wvm.listAllInterfaces.return_value:
# name and MAC are held by libvirt's object: no call to the host
self.assertEqual([c[0] for c in listed.mock_calls], ["XMLDesc", "name", "MACString", "isActive"])
def test_an_interface_libvirt_cannot_write_is_read_as_saved(self):
# netcf writes a link speed of -1 for a virtio card, then refuses that XML
listed = iface(ETHERNET)
listed.XMLDesc.side_effect = lambda flags=0: ETHERNET if flags else (_ for _ in ()).throw(error(libvirt.VIR_ERR_XML_ERROR))
conn = self.interfaces()
conn.wvm.listAllInterfaces.return_value = [listed]
(eno2,) = conn.get_ifaces_info()
self.assertEqual(eno2["name"], "eno2")
def test_a_bridge_takes_no_bridge_member_network_bridge_or_tap(self):
# as configured: a member the running bridge does not have yet is taken too
conn = self.interfaces(BRIDGE, ETHERNET, networks=["<network><bridge name='virbr0'/></network>"])
self.assertEqual(conn.get_member_candidates(["br0", "eno1", "eno2", "lo", "virbr0", "vnet3", "macvtap0"]), ["eno2"])
for listed in conn.wvm.listAllInterfaces.return_value:
listed.XMLDesc.assert_called_with(libvirt.VIR_INTERFACE_XML_INACTIVE)
def test_a_device_in_a_bond_of_a_bridge_is_taken(self):
nested = ("<interface type='bridge' name='br1'><mac address='52:54:00:aa:01:05'/><bridge><interface type='bond' name='bond0'><bond>"
"<interface type='ethernet' name='eno3'/><interface type='ethernet' name='eno4'/></bond></interface>"
"</bridge></interface>")
conn = self.interfaces(nested)
self.assertEqual(conn.get_member_candidates(["br1", "bond0", "eno3", "eno4", "eno5"]), ["eno5"])
def test_each_family_says_how_it_is_addressed(self):
conn = wvmInterface.__new__(wvmInterface)
saved = ("<interface type='ethernet' name='eth0'><start mode='onboot'/>"
"<protocol family='ipv4'><ip address='198.51.100.10' prefix='24'/></protocol>"
"<protocol family='ipv6'><autoconf/></protocol></interface>")
running = ("<interface type='ethernet' name='eth0'><protocol family='ipv4'><ip address='198.51.100.10' prefix='24'/></protocol>"
"<protocol family='ipv6'><ip address='2001:db8::5' prefix='64'/><ip address='2001:db8::6' prefix='64'/></protocol></interface>")
conn.iface = MagicMock(**{"name.return_value": "eth0", "MACString.return_value": "52:54:00:00:00:01",
"XMLDesc.side_effect": lambda flags=0: saved if flags else running})
info = conn.get_info()
self.assertEqual(info["start_mode"], "onboot")
self.assertEqual(info["ipv4"], {"method": "static", "addresses": ["198.51.100.10/24"]})
self.assertEqual(info["ipv6"], {"method": "autoconf", "addresses": ["2001:db8::5/64", "2001:db8::6/64"]})
self.assertEqual(conn.iface.XMLDesc.call_count, 2) # the running and the saved definition, once each
def test_an_address_without_a_prefix_is_shown_without_one(self):
conn = wvmInterface.__new__(wvmInterface)
xml = "<interface type='ethernet' name='eth0'><protocol family='ipv4'><ip address='192.0.2.10'/></protocol></interface>"
conn.iface = MagicMock(**{"name.return_value": "eth0", "MACString.return_value": "", "XMLDesc.return_value": xml})
self.assertEqual(conn.get_info()["ipv4"]["addresses"], ["192.0.2.10"])