diff options
| -rw-r--r-- | tests/utils.py | 2 | ||||
| -rw-r--r-- | virtManager/connection.py | 4 | ||||
| -rw-r--r-- | virtinst/connection.py | 16 | ||||
| -rw-r--r-- | virtinst/devices/disk.py | 2 | ||||
| -rw-r--r-- | virtinst/devices/interface.py | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/tests/utils.py b/tests/utils.py index eb4046a1..339072fe 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -107,7 +107,7 @@ class _URIs(object): return conn if uri not in self._conn_cache: - conn.fetch_all_guests() + conn.fetch_all_domains() conn.fetch_all_pools() conn.fetch_all_vols() conn.fetch_all_nodedevs() diff --git a/virtManager/connection.py b/virtManager/connection.py index 387ba6b0..1ccbef62 100644 --- a/virtManager/connection.py +++ b/virtManager/connection.py @@ -273,7 +273,7 @@ class vmmConnection(vmmGObject): time.sleep(.1) def _init_virtconn(self): - self._backend.cb_fetch_all_guests = ( + self._backend.cb_fetch_all_domains = ( lambda: [obj.get_xmlobj(refresh_if_nec=False) for obj in self.list_vms()]) self._backend.cb_fetch_all_pools = ( @@ -997,7 +997,7 @@ class vmmConnection(vmmGObject): self.close() self._objects = None - self._backend.cb_fetch_all_guests = None + self._backend.cb_fetch_all_domains = None self._backend.cb_fetch_all_pools = None self._backend.cb_fetch_all_nodedevs = None self._backend.cb_fetch_all_vols = None diff --git a/virtinst/connection.py b/virtinst/connection.py index b09dfe52..d707322d 100644 --- a/virtinst/connection.py +++ b/virtinst/connection.py @@ -64,7 +64,7 @@ class VirtinstConnection(object): # These let virt-manager register a callback which provides its # own cached object lists, rather than doing fresh calls - self.cb_fetch_all_guests = None + self.cb_fetch_all_domains = None self.cb_fetch_all_pools = None self.cb_fetch_all_vols = None self.cb_fetch_all_nodedevs = None @@ -156,27 +156,27 @@ class VirtinstConnection(object): # Polling routines # #################### - _FETCH_KEY_GUESTS = "vms" + _FETCH_KEY_DOMAINS = "vms" _FETCH_KEY_POOLS = "pools" _FETCH_KEY_VOLS = "vols" _FETCH_KEY_NODEDEVS = "nodedevs" - def _fetch_all_guests_raw(self): + def _fetch_all_domains_raw(self): ignore, ignore, ret = pollhelpers.fetch_vms( self, {}, lambda obj, ignore: obj) return [Guest(weakref.ref(self), parsexml=obj.XMLDesc(0)) for obj in ret] - def fetch_all_guests(self): + def fetch_all_domains(self): """ Returns a list of Guest() objects """ - if self.cb_fetch_all_guests: - return self.cb_fetch_all_guests() # pylint: disable=not-callable + if self.cb_fetch_all_domains: + return self.cb_fetch_all_domains() # pylint: disable=not-callable - key = self._FETCH_KEY_GUESTS + key = self._FETCH_KEY_DOMAINS if key not in self._fetch_cache: - self._fetch_cache[key] = self._fetch_all_guests_raw() + self._fetch_cache[key] = self._fetch_all_domains_raw() return self._fetch_cache[key][:] def _build_pool_raw(self, poolobj): diff --git a/virtinst/devices/disk.py b/virtinst/devices/disk.py index 4e5afce4..67808007 100644 --- a/virtinst/devices/disk.py +++ b/virtinst/devices/disk.py @@ -344,7 +344,7 @@ class DeviceDisk(Device): vols.append(backpath) ret = [] - vms = conn.fetch_all_guests() + vms = conn.fetch_all_domains() for vm in vms: if not read_only: if path in [vm.os.kernel, vm.os.initrd, vm.os.dtb]: diff --git a/virtinst/devices/interface.py b/virtinst/devices/interface.py index 98bd65b5..21b31172 100644 --- a/virtinst/devices/interface.py +++ b/virtinst/devices/interface.py @@ -172,7 +172,7 @@ class DeviceInterface(Device): if searchmac is None: return (False, None) - vms = conn.fetch_all_guests() + vms = conn.fetch_all_domains() for vm in vms: for nic in vm.devices.interface: nicmac = nic.macaddr or "" |