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

Remove QubesVM.is_proxyvm()

Browse Source
This commit is contained in:
Bahtiar `kalkin-` Gadimov 2016-06-16 21:32:36 +02:00
parent b0a7d0c283
commit 4a0b7585d1
No known key found for this signature in database
GPG Key ID: 96ED3C3BA19C3DEE
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubes/backup.py
View File

@ -1958,7 +1958,7 @@ class BackupRestore(object):
"template": {"func": "'n/a' if not hasattr(vm, 'template') is None " "template": {"func": "'n/a' if not hasattr(vm, 'template') is None "
"else vm_info.template"}, "else vm_info.template"},
"netvm": {"func": "'n/a' if vm.is_netvm() and not vm.is_proxyvm() else\ "netvm": {"func": "'n/a' if vm.is_netvm() else\
('*' if vm.property_is_default('netvm') else '') +\ ('*' if vm.property_is_default('netvm') else '') +\
vm_info.netvm if vm_info.netvm is not None " vm_info.netvm if vm_info.netvm is not None "
"else '-'"}, "else '-'"},

5
qubes/vm/qubesvm.py
View File

@ -386,11 +386,6 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
return os.path.join(self.dir_path, 'libvirt.xml') return os.path.join(self.dir_path, 'libvirt.xml')
# XXX I don't know what to do with these; probably should be isinstance(...) # XXX I don't know what to do with these; probably should be isinstance(...)
def is_proxyvm(self):
warnings.warn('vm.is_proxyvm() is deprecated',
DeprecationWarning)
return self.netvm is not None and self.provides_network
def is_disposablevm(self): def is_disposablevm(self):
warnings.warn('vm.is_disposable() is deprecated, use isinstance()', warnings.warn('vm.is_disposable() is deprecated, use isinstance()',
DeprecationWarning) DeprecationWarning)