Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sort domains in network tree list

Browse Source
This commit is contained in:
Rot127 2019-11-08 00:15:27 +01:00
parent a732953ffb
commit e5d4cd1e2c
No known key found for this signature in database
GPG Key ID: 228EEEFD5F98ED8A
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qubesadmin/tools/qvm_ls.py
View File

@ -38,6 +38,7 @@ import qubesadmin.spinner
import qubesadmin.tools import qubesadmin.tools
import qubesadmin.utils import qubesadmin.utils
import qubesadmin.vm import qubesadmin.vm
import qubesadmin.exc
# #
# columns # columns
@ -420,7 +421,6 @@ class Table(object):
:param qubes.vm.qubesvm.QubesVM: Parent vm of the children VMs :param qubes.vm.qubesvm.QubesVM: Parent vm of the children VMs
''' '''
childs = list() childs = list()
for child in parent.connected_vms: for child in parent.connected_vms:
if child.provides_network and child in self.domains: if child.provides_network and child in self.domains:
@ -438,18 +438,20 @@ class Table(object):
:return list(tuple()) tree: returns a list of tuple(insertion, vm) :return list(tuple()) tree: returns a list of tuple(insertion, vm)
''' '''
tree = list() tree = list()
# First append the domains without netvm and no attached vms # We need a copy of domains, because domains.remove() is not allowed
for dom in domains: # while iterating over it. Besides, the domains should be sorted anyway.
sorted_doms = sorted(domains)
for dom in sorted_doms:
try: try:
if dom.netvm is None and not dom.provides_network: if dom.netvm is None and not dom.provides_network:
tree.append((0, dom)) tree.append((0, dom))
domains.remove(dom)
# dom0 and eventually others have no netvm attribute # dom0 and eventually others have no netvm attribute
except qubesadmin.exc.QubesNoSuchPropertyError: except (qubesadmin.exc.QubesNoSuchPropertyError, AttributeError):
tree.append((0, dom)) tree.append((0, dom))
domains.remove(dom) domains.remove(dom)
# search for netvms and append their childs recursivly for dom in sorted(domains):
for dom in domains:
if dom.netvm is None and dom.provides_network: if dom.netvm is None and dom.provides_network:
tree.append((0, dom)) tree.append((0, dom))
domains.remove(dom) domains.remove(dom)