diff options
| author | Nachi Ueno <ueno.nachi@lab.ntt.co.jp> | 2011-01-26 16:58:24 -0500 |
|---|---|---|
| committer | Nachi Ueno <ueno.nachi@lab.ntt.co.jp> | 2011-01-26 16:58:24 -0500 |
| commit | d139d81d3facb440f5f9b040d05e5b380ebf2c68 (patch) | |
| tree | 78ffcc77df9bf3bc90c44be68569d851dd095ed7 | |
| parent | 2413d949e1d1ac2bed97a9ed5f54d2f9d386cbd1 (diff) | |
| download | nova-d139d81d3facb440f5f9b040d05e5b380ebf2c68.tar.gz nova-d139d81d3facb440f5f9b040d05e5b380ebf2c68.tar.xz nova-d139d81d3facb440f5f9b040d05e5b380ebf2c68.zip | |
Changed method signature of create_network
| -rwxr-xr-x | bin/nova-manage | 4 | ||||
| -rw-r--r-- | nova/network/manager.py | 6 | ||||
| -rw-r--r-- | nova/test.py | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index 1b70ebf17..7835ca551 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -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): diff --git a/nova/network/manager.py b/nova/network/manager.py index fe99f2612..fbcbea131 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -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) diff --git a/nova/test.py b/nova/test.py index 881baccd5..a12cf9d32 100644 --- a/nova/test.py +++ b/nova/test.py @@ -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 |