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

qubes/vm/mix/net: fix event arguments

Browse Source 
Arguments to events are now keyword-only and require exact names.
This commit is contained in:
Wojtek Porczyk 2017-03-06 17:20:57 +01:00
parent 4a247b1b1b
commit 417cb6e912
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
qubes/vm/mix/net.py
View File

@ -330,48 +330,48 @@ class NetVMMixin(qubes.events.Emitter):
@qubes.events.handler('property-del:netvm') @qubes.events.handler('property-del:netvm')
def on_property_del_netvm(self, event, prop, old_netvm=None): def on_property_del_netvm(self, event, prop, oldvalue=None):
''' Sets the the NetVM to default NetVM ''' ''' Sets the the NetVM to default NetVM '''
# pylint: disable=unused-argument # pylint: disable=unused-argument
# we are changing to default netvm # we are changing to default netvm
new_netvm = self.netvm newvalue = self.netvm
if new_netvm == old_netvm: if newvalue == oldvalue:
return return
self.fire_event('property-set:netvm', self.fire_event('property-set:netvm',
name='netvm', newvalue=new_netvm, oldvalue=old_netvm) name='netvm', newvalue=newvalue, oldvalue=oldvalue)
@qubes.events.handler('property-pre-set:netvm') @qubes.events.handler('property-pre-set:netvm')
def on_property_pre_set_netvm(self, event, name, new_netvm, old_netvm=None): def on_property_pre_set_netvm(self, event, name, newvalue, oldvalue=None):
''' Run sanity checks before setting a new NetVM ''' ''' Run sanity checks before setting a new NetVM '''
# pylint: disable=unused-argument # pylint: disable=unused-argument
if new_netvm is not None: if newvalue is not None:
if not new_netvm.provides_network: if not newvalue.provides_network:
raise qubes.exc.QubesValueError( raise qubes.exc.QubesValueError(
'The {!s} qube does not provide network'.format(new_netvm)) 'The {!s} qube does not provide network'.format(newvalue))
if new_netvm is self \ if newvalue is self \
or new_netvm in self.app.domains.get_vms_connected_to(self): or newvalue in self.app.domains.get_vms_connected_to(self):
raise qubes.exc.QubesValueError( raise qubes.exc.QubesValueError(
'Loops in network are unsupported') 'Loops in network are unsupported')
if not self.app.vmm.offline_mode \ if not self.app.vmm.offline_mode \
and self.is_running() and not new_netvm.is_running(): and self.is_running() and not newvalue.is_running():
raise qubes.exc.QubesVMNotStartedError(new_netvm, raise qubes.exc.QubesVMNotStartedError(newvalue,
'Cannot dynamically attach to stopped NetVM: {!r}'.format( 'Cannot dynamically attach to stopped NetVM: {!r}'.format(
new_netvm)) newvalue))
if old_netvm is not None: if oldvalue is not None:
if self.is_running(): if self.is_running():
self.detach_network() self.detach_network()
@qubes.events.handler('property-set:netvm') @qubes.events.handler('property-set:netvm')
def on_property_set_netvm(self, event, name, new_netvm, old_netvm=None): def on_property_set_netvm(self, event, name, newvalue, oldvalue=None):
''' Replaces the current NetVM with a new one and fires ''' Replaces the current NetVM with a new one and fires
net-domain-connect event net-domain-connect event
''' '''
# pylint: disable=unused-argument # pylint: disable=unused-argument
if new_netvm is None: if newvalue is None:
return return
if self.is_running(): if self.is_running():
@ -379,7 +379,7 @@ class NetVMMixin(qubes.events.Emitter):
self.create_qdb_entries() self.create_qdb_entries()
self.attach_network() self.attach_network()
new_netvm.fire_event('net-domain-connect', vm=self) newvalue.fire_event('net-domain-connect', vm=self)
@qubes.events.handler('net-domain-connect') @qubes.events.handler('net-domain-connect')
def on_net_domain_connect(self, event, vm): def on_net_domain_connect(self, event, vm):