openstack
/
nova
Code Issues Proposed changes

Changed method signature of create_network

This commit is contained in:
Nachi Ueno 2011-01-26 16:58:24 -05:00
parent 2413d949e1
commit d139d81d3f
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/nova-manage
View File

@ -495,9 +495,9 @@ class NetworkCommands(object):
cidr=fixed_range,
num_networks=int(num_networks),
network_size=int(network_size),
cidr_v6=fixed_range_v6,
vlan_start=int(vlan_start),
vpn_start=int(vpn_start),
cidr_v6=fixed_range_v6)
vpn_start=int(vpn_start))
class ServiceCommands(object):

6
nova/network/manager.py
View File

@ -428,6 +428,10 @@ class FlatDHCPManager(FlatManager):
self.driver.ensure_bridge(network_ref['bridge'],
FLAGS.flat_interface,
network_ref)
if not FLAGS.fake_network:
self.driver.update_dhcp(context, network_id)
if(FLAGS.use_ipv6):
self.driver.update_ra(context, network_id)
class VlanManager(NetworkManager):
@ -497,7 +501,7 @@ class VlanManager(NetworkManager):
network_ref['bridge'])
def create_networks(self, context, cidr, num_networks, network_size,
vlan_start, vpn_start, cidr_v6):
cidr_v6, vlan_start, vpn_start):
"""Create networks based on parameters."""
fixed_net = IPy.IP(cidr)
fixed_net_v6 = IPy.IP(cidr_v6)

3
nova/test.py
View File

@ -69,9 +69,10 @@ class TestCase(unittest.TestCase):
network_manager.VlanManager().create_networks(ctxt,
FLAGS.fixed_range,
5, 16,
FLAGS.fixed_range_v6,
FLAGS.vlan_start,
FLAGS.vpn_start,
FLAGS.fixed_range_v6)
)
# emulate some of the mox stuff, we can't use the metaclass
# because it screws with our generators