allocate_fixed_ip causes unexpected keyword argument 'vpn'

[Dan Prince]

Using nova bzr1266. I get the following exception in nova-network.log when trying to boot an instance:

2011-07-12 21:58:38,872 ERROR nova [-] Exception during message handling
(nova): TRACE: Traceback (most recent call last):
(nova): TRACE: File "/usr/lib/pymodules/python2.6/nova/rpc.py", line 232, in _process_data
(nova): TRACE: rval = node_func(context=ctxt, **node_args)
(nova): TRACE: File "/usr/lib/pymodules/python2.6/nova/network/manager.py", line 195, in allocate_for_instance
(nova): TRACE: ips = super(FloatingIP, self).allocate_for_instance(context, **kwargs)
(nova): TRACE: File "/usr/lib/pymodules/python2.6/nova/network/manager.py", line 383, in allocate_for_instance
(nova): TRACE: self._allocate_fixed_ips(admin_context, instance_id, networks, vpn=vpn)
(nova): TRACE: File "/usr/lib/pymodules/python2.6/nova/network/manager.py", line 147, in _allocate_fixed_ips
(nova): TRACE: vpn=kwargs.pop('vpn'))
(nova): TRACE: TypeError: allocate_fixed_ip() got an unexpected keyword argument 'vpn'
(nova): TRACE:
2011-07-12 21:58:38,873 ERROR nova.rpc [-] Returning exception allocate_fixed_ip() got an unexpected keyword argument 'vpn' to caller
2011-07-12 21:58:38,873 ERROR nova.rpc [-] ['Traceback (most recent call last):\n', ' File "/usr/lib/pymodules/python2.6/nova/rpc.py", line 232, in _process_data\n rval = node_func(context=ctxt, **node_args)\n', ' File "/usr/lib/pymodules/python2.6/nova/network/manager.py", line 195, in allocate_for_instance\n ips = super(FloatingIP, self).allocate_for_instance(context, **kwargs)\n', ' File "/usr/lib/pymodules/python2.6/nova/network/manager.py", line 383, in allocate_for_instance\n self._allocate_fixed_ips(admin_context, instance_id, networks, vpn=vpn)\n', ' File "/usr/lib/pymodules/python2.6/nova/network/manager.py", line 147, in _allocate_fixed_ips\n vpn=kwargs.pop(\'vpn\'))\n', "TypeError: allocate_fixed_ip() got an unexpected keyword argument 'vpn'\n"]

[Mohammed Naser (mnaser)]

This bug is introduced by the following bugfix:

https://bugs.launchpad.net/nova/+bug/809316

Looks like it needs some extra checks

[Mohammed Naser (mnaser)]

Daniel,

Could you please test it out again and see if everything works for you with my branch? It works for me, but just to be on the safe side.

Thanks!

[Dan Prince (dan-prince)]

Hi Mohammed,

This patch resolves the issue for me. Going to comment on the merge prop in a second. Take which ever format you like.

[Mohammed Naser (mnaser)]

I have puled my request and we'll go ahead with yours!