diff options
| author | Jason Kölker <jason@koelker.net> | 2011-05-23 13:51:53 -0500 |
|---|---|---|
| committer | Jason Kölker <jason@koelker.net> | 2011-05-23 13:51:53 -0500 |
| commit | 262fe4bab6f99a7be83d47fbb8582d5cdc75779e (patch) | |
| tree | c957ec62b48e224aae2ddd4759b0a049478416ee | |
| parent | 76ddebd1f0848803215eb8f33961e52bced5f058 (diff) | |
port the current create_networks over to the new network scheme
| -rw-r--r-- | nova/tests/__init__.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py index 7fba02a93..c75cdc55b 100644 --- a/nova/tests/__init__.py +++ b/nova/tests/__init__.py @@ -53,14 +53,16 @@ def setup(): os.unlink(testdb) migration.db_sync() ctxt = context.get_admin_context() - network_manager.VlanManager().create_networks(ctxt, - FLAGS.fixed_range, - FLAGS.num_networks, - FLAGS.network_size, - FLAGS.fixed_range_v6, - FLAGS.vlan_start, - FLAGS.vpn_start, - ) - + network = network_manager.VlanManager() + bridge_interface = FLAGS.flat_interface or FLAGS.vlan_interface + network.create_networks(ctxt, cidr=FLAGS.fixed_range, + num_networks=FLAGS.num_networks, + network_size=FLAGS.network_size, + cidr_v6=FLAGS.fixed_range_v6, + label='test', + bridge=FLAGS.flat_network_bridge, + bridge_interface=bridge_interface, + vpn_start=FLAGS.vpn_start, + vlan_start=FLAGS.vlan_start) cleandb = os.path.join(FLAGS.state_path, FLAGS.sqlite_clean_db) shutil.copyfile(testdb, cleandb) |