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

fix(interfaces): a new interface never replaces one the host defines

Browse source 
- The create form refuses a name the host already defines. Defining it
  again replaced that interface's configuration, for example the host's
  own uplink when a bridge was named after it.
- An interface that does not start is undefined again, so the name is
  free for another try; the name check above makes this safe.
This commit is contained in:
catborise 2026-10-26 15:41:01 +03:00
parent 09d7b0c08a
commit 484c544762
4 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
interfaces/tests/test_forms.py
View file

@ -28,6 +28,16 @@ def form(**values):
return AddInterface(data={**BASE, **values}, netdevs=NETDEVS)
class DefinedNameTestCase(SimpleTestCase):
def test_an_interface_the_host_defines_is_not_replaced(self):
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)
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())
class Ipv6FormTestCase(SimpleTestCase):
def test_valid_addresses_are_normalized(self):
f = form(ipv6_addr="2001:DB8::10/64", ipv6_gw="2001:DB8::1")
@ -196,11 +206,8 @@ class BridgeMemberXmlTestCase(SimpleTestCase):
def member(self, host_xml):
conn = wvmInterfaces.__new__(wvmInterfaces)
conn.define_iface = MagicMock()
created = MagicMock()
def get_iface(name):
if name == "br1":
return created
if host_xml is None:
raise no_interface(name)
iface = MagicMock()
@ -209,7 +216,7 @@ class BridgeMemberXmlTestCase(SimpleTestCase):
conn.get_iface = MagicMock(side_effect=get_iface)
conn.create_iface("br1", "bridge", "onboot", "bond0", "none", "", "", "none", "", "", "on", 0)
self.assertTrue(created.create.called)
self.assertTrue(conn.define_iface.return_value.create.called)
members = etree.fromstring(conn.define_iface.call_args[0][0]).findall("bridge/interface")
self.assertEqual(len(members), 1)
return members[0]
@ -254,6 +261,15 @@ 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):
conn = wvmInterfaces.__new__(wvmInterfaces)
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()
class BridgeSettingsTestCase(SimpleTestCase):
def test_a_bridge_needs_stp_and_a_delay(self):