Merge lp:~soren/nova/lp720984 into lp:~hudson-openstack/nova/trunk

[Soren Hansen]

Add **kwargs to VlanManager's create_networks so that optional args from other managers don't break.

"nova-manage create network" recently started passing a label kwarg to create_networks. VlanManager.create_networks has no such kwarg.

Add a **kwargs to VlanManager.create_networks to catch such optional args.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

[Jay Pipes (jaypipes)]

hmm, this *really* should be picked up by unit tests...

=== modified file 'nova/network/manager.py'
--- nova/network/manager.py	2011-02-17 20:20:11 +0000
+++ nova/network/manager.py	2011-02-17 21:51:56 +0000
@@ -509,7 +509,7 @@
                                        network_ref['bridge'])
 
     def create_networks(self, context, cidr, num_networks, network_size,
-                        cidr_v6, vlan_start, vpn_start):
+                        cidr_v6, vlan_start, vpn_start, **kwargs):
         """Create networks based on parameters."""
         # Check that num_networks + vlan_start is not > 4094, fixes lp708025
         if num_networks + vlan_start > 4094: