From e310032b36294ac70bc0d5e2339b1b257f908d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Bastian?= Date: Mon, 9 Mar 2020 17:09:35 +0100 Subject: [PATCH] Network: do not check existence at __init__ This causes a verbose error on normal behaviour that cannot be muted --- lxc_net/network.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lxc_net/network.py b/lxc_net/network.py index 26b59b7..53a2af2 100644 --- a/lxc_net/network.py +++ b/lxc_net/network.py @@ -4,8 +4,6 @@ from . import settings from . import util from .xml_template import XMLTemplate -import libvirt - class Network(util.LibvirtObject): class AlreadyExists(Exception): @@ -18,19 +16,13 @@ class Network(util.LibvirtObject): if not name: name = str(self.id) - self.name = settings.PREFIX + "_" + name + self.name = settings.PREFIX + "_link_" + name self.bridge_id = settings.NETWORK_ID * 0xFF + self.id self.bridge_mac = util.MACAddress(self.id, None) self.ipv4 = util.Addrv4(self.id, None) self.ipv6 = util.Addrv6(self.id, None) self.lxc_network = None - try: - if self.conn.networkLookupByName(self.name): - raise self.AlreadyExists() - except libvirt.libvirtError: - pass - def create(self): if self.lxc_network: raise self.AlreadyExists()