From 760d98ba6448392db1c2cb495de55319b58b48f6 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Fri, 21 Aug 2020 11:52:11 -0400 Subject: [PATCH] network: Rework dhcp_leases usage to avoid dead code Signed-off-by: Cole Robinson --- virtManager/object/domain.py | 2 +- virtManager/object/network.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/virtManager/object/domain.py b/virtManager/object/domain.py index 9621eb971..c814183c0 100644 --- a/virtManager/object/domain.py +++ b/virtManager/object/domain.py @@ -1087,7 +1087,7 @@ class vmmDomain(vmmLibvirtObject): if iface.type == "network": net = self.conn.get_net(iface.source) if net: - net.refresh_dhcp_leases() + net.get_dhcp_leases(refresh=True) if not self.is_active(): return diff --git a/virtManager/object/network.py b/virtManager/object/network.py index 30c8efb5c..07fa9b0ac 100644 --- a/virtManager/object/network.py +++ b/virtManager/object/network.py @@ -94,16 +94,16 @@ class vmmNetwork(vmmLibvirtObject): def set_autostart(self, value): self._backend.setAutostart(value) - def refresh_dhcp_leases(self): + def _refresh_dhcp_leases(self): try: self._leases = self._backend.DHCPLeases() except Exception as e: log.debug("Error getting %s DHCP leases: %s", self, str(e)) self._leases = [] - def get_dhcp_leases(self): - if self._leases is None: - self.refresh_dhcp_leases() + def get_dhcp_leases(self, refresh=False): + if self._leases is None or refresh: + self._refresh_dhcp_leases() return self._leases def get_uuid(self):